Compare commits

...

1 Commits

Author SHA1 Message Date
coah
9cc77ea8e2 fix(chansvm): use compatible const converter callback types 2026-10-08 22:45:23 -05:00
3 changed files with 75 additions and 17 deletions

View File

@@ -7,7 +7,7 @@
extern "C" {
#endif
typedef CHANSVmObjHdr* (*VmConvertFunc)(CHANSVm*, CHANSVmObjType, CHANSVmObjHdr*);
typedef CHANSVmObjHdr* (*VmConvertFunc)(CHANSVm*, CHANSVmObjType, const CHANSVmObjHdr*);
typedef struct VmConvertEntry {
VmConvertFunc convFunc[6]; // 0x00

View File

@@ -647,7 +647,7 @@ static s32 CHANSVmParseInt(const CHANSVmObjHdr* obj, s32 base, u64* out) {
return 0;
}
CHANSVmObjHdr* CHANSVmConvertToIntFromFloat(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
CHANSVmObjHdr* CHANSVmConvertToIntFromFloat(CHANSVm* vm, CHANSVmObjType type, const CHANSVmObjHdr* object) {
// Convert to int from float
CHANSVmObjHdr* newObj = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_INTEGER, 0);
if (newObj != vmNull) {
@@ -660,7 +660,7 @@ CHANSVmObjHdr* CHANSVmConvertToIntFromFloat(CHANSVm* vm, CHANSVmObjType type, CH
return newObj;
}
CHANSVmObjHdr* CHANSVmConvertToIntFromStr(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
CHANSVmObjHdr* CHANSVmConvertToIntFromStr(CHANSVm* vm, CHANSVmObjType type, const CHANSVmObjHdr* object) {
CHANSVmObjHdr* newObj = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_INTEGER, 0);
if (newObj != vmNull && !CHANSVmParseInt(object, 0, (u64*)&newObj->value.int_v)) {
newObj = vmNull;
@@ -668,11 +668,11 @@ CHANSVmObjHdr* CHANSVmConvertToIntFromStr(CHANSVm* vm, CHANSVmObjType type, CHAN
return newObj;
}
CHANSVmObjHdr* CHANSVmConvertToIntFromArray(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
CHANSVmObjHdr* CHANSVmConvertToIntFromArray(CHANSVm* vm, CHANSVmObjType type, const CHANSVmObjHdr* object) {
return vmNull;
}
CHANSVmObjHdr* CHANSVmConvertToFloatFromUndefined(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
CHANSVmObjHdr* CHANSVmConvertToFloatFromUndefined(CHANSVm* vm, CHANSVmObjType type, const CHANSVmObjHdr* object) {
CHANSVmObjHdr* result = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_FLOAT, 0);
if (result != vmNull) {
result->value.float_v = VM_NAN;
@@ -680,7 +680,7 @@ CHANSVmObjHdr* CHANSVmConvertToFloatFromUndefined(CHANSVm* vm, CHANSVmObjType ty
return result;
}
CHANSVmObjHdr* CHANSVmConvertToFloatFromInt(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* intObj) {
CHANSVmObjHdr* CHANSVmConvertToFloatFromInt(CHANSVm* vm, CHANSVmObjType type, const CHANSVmObjHdr* intObj) {
CHANSVmObjHdr* result = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_FLOAT, 0);
if (result != vmNull) {
result->value.float_v = VmIntToFloat(intObj->value.int_v);
@@ -778,7 +778,7 @@ CHANSVmObjHdr* CHANSVmConvertToFloatFromStr(CHANSVm* vm, CHANSVmObjType type, co
return newObj;
}
CHANSVmObjHdr* CHANSVmConvertToStrFromUndefined(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
CHANSVmObjHdr* CHANSVmConvertToStrFromUndefined(CHANSVm* vm, CHANSVmObjType type, const CHANSVmObjHdr* object) {
return (CHANSVmObjHdr*)CHANSVmConstStringObjectUndefined_;
}
@@ -796,7 +796,7 @@ static int VmToStrFromInt(vmWString output, vmSize length, vmInteger integer) {
return len;
}
CHANSVmObjHdr* CHANSVmConvertToStrFromInt(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
CHANSVmObjHdr* CHANSVmConvertToStrFromInt(CHANSVm* vm, CHANSVmObjType type, const CHANSVmObjHdr* object) {
CHANSVmObjHdr* newObject = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_STRING, VM_STR_LENGTH(64));
if (newObject) {
vmS32 len = VmToStrFromInt(newObject->value.wstring_v->spData, 64, object->value.int_v);
@@ -812,7 +812,7 @@ error:
return vmNull;
}
CHANSVmObjHdr* CHANSVmConvertToStrFromFloat(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* value) {
CHANSVmObjHdr* CHANSVmConvertToStrFromFloat(CHANSVm* vm, CHANSVmObjType type, const CHANSVmObjHdr* value) {
const CHANSVmObjHdr* base;
CHANSVmObjHdr* newObj;
s32 result;
@@ -843,13 +843,13 @@ error:
return vmNull;
}
static CHANSVmObjHdr* VmArrayJoinCommon(CHANSVm* vm, u32 retObjAddr, CHANSVmObjHdr* object, u32 separatorAddr, u32 separatorLen);
static CHANSVmObjHdr* VmArrayJoinCommon(CHANSVm* vm, u32 retObjAddr, const CHANSVmObjHdr* object, u32 separatorAddr, u32 separatorLen);
CHANSVmObjHdr* CHANSVmConvertToStrFromArray(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
CHANSVmObjHdr* CHANSVmConvertToStrFromArray(CHANSVm* vm, CHANSVmObjType type, const CHANSVmObjHdr* object) {
return VmArrayJoinCommon(vm, 0, object, 0, 0);
}
CHANSVmObjHdr* CHANSVmConvertObjectTypeError(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
CHANSVmObjHdr* CHANSVmConvertObjectTypeError(CHANSVm* vm, CHANSVmObjType type, const CHANSVmObjHdr* object) {
CHANS_VM_PRINTF(1176, ", type to %d from %d\n", type, object->type);
return vmNull;
}
@@ -902,7 +902,7 @@ char scVmGetResultType[] = "VmGetResultType";
const VmConvertEntry VmTypeConvertFuncTbl[] = {
{vmNull, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError},
{CHANSVmConvertObjectTypeError, vmNull, CHANSVmConvertToIntFromFloat, CHANSVmConvertToIntFromStr, CHANSVmConvertToIntFromArray, CHANSVmConvertObjectTypeError},
{CHANSVmConvertToFloatFromUndefined, CHANSVmConvertToFloatFromInt, vmNull, (VmConvertFunc)CHANSVmConvertToFloatFromStr, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError},
{CHANSVmConvertToFloatFromUndefined, CHANSVmConvertToFloatFromInt, vmNull, CHANSVmConvertToFloatFromStr, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError},
{CHANSVmConvertToStrFromUndefined, CHANSVmConvertToStrFromInt, CHANSVmConvertToStrFromFloat, vmNull, CHANSVmConvertToStrFromArray, CHANSVmConvertObjectTypeError},
{CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, vmNull, CHANSVmConvertObjectTypeError},
{CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, vmNull},
@@ -1962,7 +1962,7 @@ error:
return vmFalse;
}
static ArrayChunk* VmArraySeekTop(CHANSVmObjHdr* array) {
static ArrayChunk* VmArraySeekTop(const CHANSVmObjHdr* array) {
ArrayChunk* cur = vmNull;
if (array != vmNull) {
cur = *array->value.ptr_v;
@@ -2089,7 +2089,7 @@ u32 CHANSVmGetArrayLength(CHANSVm* vm, CHANSVmObjHdr* array) {
return 0;
}
static u32 VmArrayJoinEstimateStrSize(CHANSVmObjHdr* object, u32 sepLen) {
static u32 VmArrayJoinEstimateStrSize(const CHANSVmObjHdr* object, u32 sepLen) {
ArrayChunk* chunk;
u32 total;
u32 countInChunk;
@@ -2137,7 +2137,7 @@ error:
return 0;
}
static u32 VmArrayJoinSub(CHANSVmObjHdr* obj, CHANSVmObjHdr* array, wchar_t* separator, u32 sepLen, u32 bufSize, u32 offset) {
static u32 VmArrayJoinSub(CHANSVmObjHdr* obj, const CHANSVmObjHdr* array, wchar_t* separator, u32 sepLen, u32 bufSize, u32 offset) {
ArrayChunk* chunk;
u32 countInChunk;
u32 savedOffset;
@@ -2216,7 +2216,7 @@ error:
return 0;
}
CHANSVmObjHdr* VmArrayJoinCommon(CHANSVm* vm, u32 retObjAddr, CHANSVmObjHdr* object, u32 separatorAddr, u32 separatorLen) {
CHANSVmObjHdr* VmArrayJoinCommon(CHANSVm* vm, u32 retObjAddr, const CHANSVmObjHdr* object, u32 separatorAddr, u32 separatorLen) {
CHANSVmObjHdr* result;
u32 estSize;
u32 actualLen;

View File

@@ -0,0 +1,58 @@
# CHANSVm converter input types
Base: `20cf9f9f25b13b8cd6910e07cc5eb71558845d4e`, target 43U only.
## Change and source review
`CHANSVmConvertToFloatFromStr` took a pointer-to-const source header while
`VmConvertFunc` specified a mutable source header. The conversion table cast
hid that incompatible function-pointer type at the indirect call.
Give all 11 converters and the callback typedef the same pointer-to-const
source-header type, and remove the callback cast. All converters either read
source values, ignore the source, or pass it through the read-only array-join
path. They write only newly allocated result objects. Propagate the input type
through `VmArrayJoinCommon`, `VmArrayJoinEstimateStrSize`, `VmArrayJoinSub`, and
`VmArraySeekTop`, including the forward declaration. These helpers only read
the source header; the join routines write the destination string and local
state. `VmArraySeekTop` still returns a mutable chunk pointer because header
constness is shallow and other callers can mutate array elements. No cast is
needed at the array-join boundary.
The public `CHANSVmConvertObjectType` input remains mutable: its same-type fast
path returns the original mutable object. Passing it to a const-source
converter is valid. No executable expressions, flags, data or layout changed.
## Fresh leaf verification
Configured using the restored `wii-source-tools/build-43U.sh` tool paths and
flags, with commands run in the isolated leaf instead of that script's fixed
main directory. Baseline object was freshly compiled before editing.
- Entire CHANSVm object is byte-identical to that baseline, SHA256
`11fa48261cd93668d133d5ef73efbf3c9109181730b21409153b78316189e063`.
All 233 sibling function spans, allocated sections and relocations unchanged.
- All 15 emitted converter/dispatch/join functions: exact-name objdiff 100.0,
raw target function bytes and normalized relocation targets identical
(86 code relocations). VmArraySeekTop is inlined.
- All target data sections match including alignment padding: `.rodata` 1432,
`.data` 4672, `.sdata2` 184, `.sdata` 600, `.sbss` 16 bytes;
all 614 data relocations match by resolved section/function target.
- Pool: 125/125 strings identical. Dispatch ctxdiff: 47/47 instructions, 0 diffs.
FloatFromStr: 83/83 instructions, one textual symbol-alias difference
(`VmNaN` versus `lbl_81694F08`); raw bytes and resolved relocation target are
identical. This is not represented as a literal ctxdiff-zero result.
- Fresh full 43U build, report and `build/43U/ok` pass. DOL SHA1:
`26116613f624061ba99c8d1a299aaa6efa85670d`.
- All 1028 unit measures/functions/sections and overall report measures are
unchanged against the saved base report. All 22 workflow guards pass with
no skips. `git diff --check` passes.
This is a binary-neutral type correction, not a new matching/linking gain.
CHANSVm remains 229/233 exact, 45284/53564 exact code bytes, 6904/6904 matching
data bytes, and unlinked. The completion assertion still fails on the existing
project-wide incomplete code/link totals; no full-completion claim is made.
Local evidence: `../vm-converter-const-evidence/` contains baseline/candidate
build logs, original baseline object/report, verification script/results,
full-build/report/ok logs, pool and ctxdiff results, guards and completion logs.