Senior-engineer / QA audit landed 13 silent-miscompile and data-
integrity fixes spanning the whole compiler+runtime+storage stack.
Each fix is paired with either an integration test in the suite or
a focused regression check; all 6 release gates stay green:
go test ./..., FiveSql2 43/43, Harbour compat 56/56, std.ch 17/17,
FRB 7/7, examples 65/71.
Compiler
--------
* genpc IF/ELSEIF jumpEnd2 patching (compiler/genpc/genpc.go).
Per-ELSEIF branch terminators were stashed into `_ = jumpEnd2`
and never patched — the relative offset stayed 0 and the runtime
walked the next ELSEIF's PcOpJumpFalse opcode as if it were
jump-offset data. Bytecode-level corruption in pcode mode. Now
collected into a slice and patched at end-of-IF. Verified via
Grade(95..50) cases 11a-e added to tests/frb/test_frb_pcode_sweep.
* countLocalsInStmts / scanBodyLocals missing bodies
(compiler/gengo/gen_util.go, compiler/gengo/gengo.go). Frame-size
counter skipped WATCH/TIMEOUT/PARALLEL FOR bodies, so a LOCAL
declared inside one of those constructs got a slot index past
the runtime's allocated count — silent NIL reads or out-of-range
stomps.
* emitMethodDeclStandalone nested LOCAL (compiler/gengo/gen_class.go).
Same bug class but on the *method* side. Pre-fix repro:
METHOD Stomp(n) CLASS T
LOCAL a := 1, b := 2
IF n > 0
LOCAL c := 30, d := 40, e := 50, f := 60
Inner( n )
IF c != 30 .OR. d != 40 .OR. e != 50 .OR. f != 60 ...
printed `c, d, e, f = 5, NIL, NIL, NIL` because Inner's frame
collided with Stomp's underallocated slot range. Now counts
body-nested LOCALs into the frame and pre-allocates indices via
scanBodyLocals.
* genpc unsupported-AST diagnostic surface (compiler/genpc/genpc.go,
hbrt/pcode.go, cmd/five/main.go, hbrtl/frb.go). The `default`
cases in emitStmt / emitExpr silently emitted PushNil / no-op
for nodes the pcode generator doesn't implement (ClassDecl,
MethodDecl, xBase commands, concurrency primitives, …). Added
`PcodeModule.Warnings []string` populated by noteUnsupported,
surfaced on stderr from the build pipeline. Users now see
"pcode: AST node not supported in --pcode/FRB-pcode mode: stmt
*ast.GoBlockStmt" instead of getting a silently broken module.
Runtime
-------
* class.go Send/tryBinaryOp t.self defer-restore (hbrt/class.go).
Restoration was a plain `t.self = oldSelf` after `fn(t)`. Any
panic in the method body skipped the line, so the next BEGIN
SEQUENCE / RECOVER handler ran with the THROWING object's Self
— `::field` resolved against the wrong receiver. Wrapped both
restore sites in `defer func() { t.self = oldSelf }()`.
Verified: pre-fix RECOVER saw "THROWER", post-fix "OUTER".
* hbfunc.go HB_FUNC parameter Frame() (hbrt/hbfunc.go). The
RegisterDynamicFunc wrapper called `fn(ctx)` without ever
calling Frame, so `ctx.ParC(1)` / `ctx.Local(n)` read through
`t.curFrame.localBase + n - 1` against the *caller's* frame.
Every #pragma BEGINDUMP HB_FUNC taking parameters silently
returned "" / 0 / "" for them — masked by ParNIDef-style
defaults. Wrapper now does `t.Frame(t.pendingParams, 0); defer
t.EndProc()` before dispatch.
* pcode codeblock closure capture (hbrt/pcinterp.go, hbrt/pcode.go,
hbrt/thread.go, compiler/genpc/genpc.go). PcOpPushBlock recorded
`nDetached` but never copied enclosing locals; free vars in the
block body fell through to memvar lookup → NIL. Wired full
capture pipeline:
- New opcodes PcOpPushDetached (0x59) / PcOpPopDetached (0x5A).
- PushBlock now reads per-slot source-local indices and
snapshots into bb.Detached at construction time.
- New detachedMap in genpc auto-promotes any free var that
resolves to an enclosing-frame local into a capture slot.
- emitAssignAsExpr leaves the assigned value on the eval stack
so SeqExpr items like `{|v| acc += v, acc }` work.
- Thread tracks curBlock with paired Set/restore in the block's
Fn wrapper for nested-block evaluation.
Mutating capture (acc += v across successive Evals) now works.
* vm.NewThread statics + waFactory propagation (hbrt/vm.go).
GoLaunch / GoLaunchBlock call NewThread directly. Previously
the statics map and WA factory were applied only in Run(), so
goroutine-spawned PRG code panicked on STATIC access ("static
index out of range") and crashed dereferencing nil WA on any
DB call. Both now happen inside NewThread under the same lock
as TID assignment.
Data layer
----------
* dbf concurrent Append lock (hbrdd/dbf/dbf.go,
hbrdd/dbf/locks_posix.go, hbrdd/dbf/locks_windows.go). Append
bumped a local recCount with no file-system serialization. Two
shared-mode processes both wrote at the same RecordOffset; one
record silently overwrote the other. Added an append-intent
byte-range lock at offset 0x7FFFFFFE + bounded retry, on-disk
header refresh inside the locked region, and immediate header
write so peers refresh past our slot.
* indexer negative numeric key encoding (hbrdd/dbf/indexer.go +
new hbrdd/dbf/encode_numeric_test.go). `%20.10f` formats `-100`
as `" -100.0000000000"` and `99` as `" 99.0000000000"`.
ASCII ' ' (0x20) < '-' (0x2D), so `99` lex-compared LESS than
`-100` — every NTX/CDX index over a column that ever held a
negative number returned wrong rows for SEEK / range scans.
Replaced with a 1-byte sign prefix + 21-byte zero-padded
magnitude (negatives use digit-complement) so byte order
matches numeric order across signs and magnitudes. Format
change: existing indexes built with the old encoding must be
REINDEXed. Three unit tests pin the order.
* dbf Append index maintenance hooks (hbrdd/dbf/dbf.go,
hbrdd/dbf/indexer.go). Append never inserted into open NTX/CDX
indexes — the audit's canonical scenario `SET INDEX TO …;
APPEND BLANK; REPLACE …; dbSeek …` silently missed the new
record. Added optional IndexWriter interface, queue the new
recNo in pendingIdxInserts, drain after flushRecord by calling
InsertKey on every open writer-supporting engine. NTX
participates (its existing rebuild-on-insert is correct);
CDX online maintenance is deferred to a follow-up — those
indexes still need REINDEX. Verified: post-fix SEEK("Charlie")
after APPEND BLANK + REPLACE finds the new record.
* dbf PACK crash-safety (hbrdd/dbf/dbf.go). The old in-place
rewrite read record N, overwrote slot M<N, then truncated.
Power loss after partial loop left a file with overwritten
prefix and no original copies of the records already advanced
past — silent data loss. Rewrote to:
1) drop mmap, build `<file>.pack.tmp` with all surviving
records,
2) Sync(),
3) close original handle + os.Rename(tmp, orig) (atomic on
same FS),
4) reopen + re-mmap.
TestComp_Pack passes; readers always see either the pre-PACK
or post-PACK contents, never a half-state.
* mem RDD torn reads (hbrdd/mem/memrdd.go). The comment claimed
in-place PutValue was safe because hbrt.Value "fits in a
single machine word + pointer". hbrt.Value is 24 bytes (3
words) — a concurrent reader could observe new type tag with
stale scalar/ptr and type-confuse on the next AsXxx() call.
Switched mu to sync.RWMutex; GetValue takes RLock,
Append/PutValue/Delete/Recall take Lock. `go test -race
./hbrdd/mem/` clean.
Files touched
-------------
compiler/gengo/gen_class.go, gen_util.go, gengo.go
compiler/genpc/genpc.go
hbrt/class.go, hbfunc.go, pcinterp.go, pcode.go, thread.go, vm.go
hbrdd/dbf/dbf.go, indexer.go, locks_posix.go, locks_windows.go
hbrdd/dbf/encode_numeric_test.go (new)
hbrdd/mem/memrdd.go
cmd/five/main.go
hbrtl/frb.go
tests/frb/test_frb_pcode_sweep.prg
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
148 lines
4.8 KiB
Go
148 lines
4.8 KiB
Go
// Copyright (c) 2026 Charles KWON OhJun (charleskwonohjun@gmail.com)
|
||
// All rights reserved.
|
||
|
||
// Five pcode — stack-based bytecode for FRB interpreter mode.
|
||
// Each opcode maps 1:1 to a Thread method call, making the pcode
|
||
// a direct serialization of what gengo generates as Go code.
|
||
//
|
||
// Format: [opcode:1byte] [operands:variable]
|
||
// Strings: [len:uint16 LE] [bytes]
|
||
// Numbers: int64 = 8 bytes LE, float64 = 8 bytes LE
|
||
|
||
package hbrt
|
||
|
||
// Opcode definitions
|
||
const (
|
||
// Stack operations
|
||
PcOpNop byte = 0x00
|
||
PcOpPushNil byte = 0x01
|
||
PcOpPushTrue byte = 0x02
|
||
PcOpPushFalse byte = 0x03
|
||
PcOpPushInt byte = 0x04 // + int64 LE
|
||
PcOpPushDouble byte = 0x05 // + float64 LE (8 bytes)
|
||
PcOpPushString byte = 0x06 // + uint16 len + bytes
|
||
PcOpPushLocal byte = 0x07 // + uint16 index
|
||
PcOpPopLocal byte = 0x08 // + uint16 index
|
||
PcOpPop byte = 0x09
|
||
PcOpDup byte = 0x0A
|
||
|
||
// Arithmetic
|
||
PcOpPlus byte = 0x10
|
||
PcOpMinus byte = 0x11
|
||
PcOpMult byte = 0x12
|
||
PcOpDivide byte = 0x13
|
||
PcOpMod byte = 0x14
|
||
PcOpPower byte = 0x15
|
||
PcOpNegate byte = 0x16
|
||
|
||
// Comparison
|
||
PcOpEqual byte = 0x20
|
||
PcOpNotEqual byte = 0x21
|
||
PcOpLess byte = 0x22
|
||
PcOpGreater byte = 0x23
|
||
PcOpLessEq byte = 0x24
|
||
PcOpGreaterEq byte = 0x25
|
||
PcOpInString byte = 0x26
|
||
|
||
// Logical
|
||
PcOpAnd byte = 0x28
|
||
PcOpOr byte = 0x29
|
||
PcOpNot byte = 0x2A
|
||
|
||
// String
|
||
PcOpConcat byte = 0x2C // same as Plus for strings
|
||
|
||
// Flow control
|
||
PcOpJump byte = 0x30 // + int32 LE (relative offset)
|
||
PcOpJumpFalse byte = 0x31 // + int32 LE
|
||
PcOpJumpTrue byte = 0x32 // + int32 LE
|
||
PcOpReturn byte = 0x33
|
||
PcOpRetValue byte = 0x34
|
||
|
||
// Frame
|
||
PcOpFrame byte = 0x38 // + uint16 params + uint16 locals
|
||
PcOpEndProc byte = 0x39
|
||
|
||
// Function calls
|
||
PcOpPushSymbol byte = 0x40 // + uint16 string len + name
|
||
PcOpPushNilArg byte = 0x41 // push NIL for function self
|
||
PcOpFunction byte = 0x42 // + uint16 nArgs
|
||
PcOpDo byte = 0x43 // + uint16 nArgs
|
||
|
||
// Workarea field access — skips PushSymbol + Function dispatch
|
||
// for `FieldGet(n)` where n is a literal. Emitted by genpc as a
|
||
// peephole optimization. Operand: uint16 1-based field position.
|
||
PcOpFieldGet byte = 0x46
|
||
|
||
// `AllTrim(FieldGet(n))` peephole — fetch the field, trim the
|
||
// result in place, push one string. Skips two Function dispatches
|
||
// (FieldGet + AllTrim) and one intermediate string allocation
|
||
// per invocation. Operand: uint16 1-based field position.
|
||
PcOpFieldTrim byte = 0x47
|
||
|
||
// Self / OOP
|
||
PcOpPushSelf byte = 0x48
|
||
PcOpPushSelfField byte = 0x49 // + uint16 len + name
|
||
PcOpSetSelfField byte = 0x4A // + uint16 len + name
|
||
PcOpSend byte = 0x4B // + uint16 len + name + uint16 nArgs
|
||
|
||
// Array / Hash
|
||
PcOpArrayGen byte = 0x50 // + uint16 count
|
||
PcOpHashGen byte = 0x51 // + uint16 count
|
||
PcOpArrayPush byte = 0x52
|
||
PcOpArrayPop byte = 0x53
|
||
|
||
// Block — operand layout:
|
||
// PcOpPushBlock + uint32 codeLen + body bytes
|
||
// + uint16 nParams + uint16 nDetached
|
||
// + nDetached × uint16 (source-local index per slot)
|
||
// Each captured slot snapshots the current frame's Local(idx)
|
||
// into the block's Detached[i] at creation time. Body accesses
|
||
// captured values via PcOpPushDetached / PcOpPopDetached with the
|
||
// 0-based slot index.
|
||
PcOpPushBlock byte = 0x58
|
||
PcOpPushDetached byte = 0x59 // + uint16 0-based detached slot
|
||
PcOpPopDetached byte = 0x5A // + uint16 0-based detached slot
|
||
|
||
// Local operations
|
||
PcOpLocalAddInt byte = 0x60 // + uint16 index + int32 value
|
||
PcOpInc byte = 0x61
|
||
PcOpDec byte = 0x62
|
||
|
||
// Special
|
||
PcOpPopLogical byte = 0x70 // pop and store logical result
|
||
PcOpPushBool byte = 0x71 // + 1 byte (0 or 1)
|
||
|
||
// Memvar lookup — runtime resolution of an unresolved identifier.
|
||
// Used by the macro evaluator and the debugger's expression evaluator:
|
||
// at compile time we don't know which LOCAL frame an identifier
|
||
// refers to, so we emit this op with the name and resolve at runtime
|
||
// via t.Memvars (PRIVATE/PUBLIC). Pushes NIL if the name isn't set.
|
||
PcOpPushMemvar byte = 0x72 // + uint16 len + name
|
||
|
||
// Line info (for debugging)
|
||
PcOpLine byte = 0xFE // + uint16 lineNo
|
||
PcOpHalt byte = 0xFF
|
||
)
|
||
|
||
// PcodeFunc represents a pcode-compiled function.
|
||
type PcodeFunc struct {
|
||
Name string
|
||
Code []byte // bytecode
|
||
Params int // number of parameters
|
||
Locals int // number of locals
|
||
}
|
||
|
||
// PcodeModule represents a compiled pcode module (multiple functions).
|
||
type PcodeModule struct {
|
||
Name string
|
||
Funcs map[string]*PcodeFunc
|
||
Strings []string // string constant pool
|
||
// Warnings captures compile-time diagnostics from genpc — most
|
||
// commonly "AST node X not supported in pcode mode". Surfaced
|
||
// by the build pipeline so users learn their PRG isn't fully
|
||
// pcode-compilable instead of seeing silent wrong results from
|
||
// no-op fallbacks. Empty slice = clean compile.
|
||
Warnings []string
|
||
}
|