Skip to content

Port m2c's three nice-to-have commits (+1 match, three silent miscompiles fixed) #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
macabeus merged 6 commits into from
Aug 5, 2026
Merged

Port m2c's three nice-to-have commits (+1 match, three silent miscompiles fixed) #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3a71fa8
feat(idiom): fold boolean negations — `cmp ^ 1`, `cmp == 0`, `cmp != 0`
macabeus Aug 5, 2026
35e5ed8
fix(mips): key the pending compare by VALUE, not by register
macabeus Aug 5, 2026
49ed535
fix(thumb): a flag-setter between a compare and its branch declines loud
macabeus Aug 5, 2026
96ac651
test(symbols): pin that the MAP is not the reference set
macabeus Aug 5, 2026
92b4d40
test(frontend): pin the whole sp-as-data class, not one spelling at a…
macabeus Aug 5, 2026
32d71cc
bench: refresh results — asmlift 360 -> 361 vs m2c 342
macabeus Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions apps/benchmark/results/results.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"meta": {
"generatedAt": "2026-08-05T00:35:23.409Z",
"generatedAt": "2026-08-05T14:19:19.617Z",
"toolchains": [
"ido7.1",
"agbcc",
Expand All @@ -14,8 +14,8 @@
"real": 240
},
"asmlift": {
"commit": "3c0f76118ae3adaebd6993e88810a83664def346",
"dirty": true
"commit": "92b4d4019ffc6e30c7f5accaa0740669631bdf74",
"dirty": false
},
"m2c": {
"commit": "ad5c529a65ca1e5191b00a4a7b4cbfe79a7b45a0"
Expand Down Expand Up @@ -3423,11 +3423,11 @@
"droppedCandidates": [
{
"label": "unsigned/raw-globals",
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-CztkBl/c.c:1077: invalid operands to binary <<"
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-NkXTmJ/c.c:1077: invalid operands to binary <<"
},
{
"label": "unsigned/scopebase/raw-globals",
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-9kTYnQ/c.c:1078: invalid operands to binary <<"
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-hAz9gH/c.c:1078: invalid operands to binary <<"
}
],
"symbolsUsed": [
Expand Down Expand Up @@ -4329,7 +4329,7 @@
"droppedCandidates": [
{
"label": "unsigned",
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-GYLwTt/c.c:1076: `gBgDataPtrs' undeclared (first use in this function)"
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-MUXcew/c.c:1076: `gBgDataPtrs' undeclared (first use in this function)"
}
],
"symbolsUsed": [],
Expand Down Expand Up @@ -5402,7 +5402,7 @@
"droppedCandidates": [
{
"label": "unsigned",
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-0ySZ7J/c.c:1077: too many arguments to function `thunk_sub_080002A0'"
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-iHbWd3/c.c:1077: too many arguments to function `thunk_sub_080002A0'"
}
],
"symbolsUsed": [],
Expand Down Expand Up @@ -6148,43 +6148,43 @@
"droppedCandidates": [
{
"label": "unsigned/raw-globals",
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-q08N9S/c.c:1085: incompatible types in assignment"
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-2duYZD/c.c:1085: incompatible types in assignment"
},
{
"label": "unsigned/coalesce-v2-v3/raw-globals",
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-kVtPjs/c.c:1084: incompatible types in assignment"
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-IaZKL3/c.c:1084: incompatible types in assignment"
},
{
"label": "unsigned/coalesce-v2-v4/raw-globals",
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-xZOlxN/c.c:1084: incompatible types in assignment"
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-duAGNb/c.c:1084: incompatible types in assignment"
},
{
"label": "unsigned/defsite/raw-globals",
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-26kOPm/c.c:1086: incompatible types in assignment"
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-RWHHSI/c.c:1086: incompatible types in assignment"
},
{
"label": "unsigned/defsite/coalesce-v2-v4/raw-globals",
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-f2VLeO/c.c:1085: incompatible types in assignment"
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-tMRk9i/c.c:1085: incompatible types in assignment"
},
{
"label": "signed/raw-globals",
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-WF9nHM/c.c:1085: incompatible types in assignment"
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-PczVje/c.c:1085: incompatible types in assignment"
},
{
"label": "signed/coalesce-v2-v3/raw-globals",
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-mDzvDo/c.c:1084: incompatible types in assignment"
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-LRGxNi/c.c:1084: incompatible types in assignment"
},
{
"label": "signed/coalesce-v2-v4/raw-globals",
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-PK7L0x/c.c:1084: incompatible types in assignment"
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-kkGrTr/c.c:1084: incompatible types in assignment"
},
{
"label": "signed/defsite/raw-globals",
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-yiEeM7/c.c:1086: incompatible types in assignment"
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-qYty7P/c.c:1086: incompatible types in assignment"
},
{
"label": "signed/defsite/coalesce-v2-v4/raw-globals",
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-kiF7nl/c.c:1085: incompatible types in assignment"
"error": "agbcc failed: /var/folders/q_/6tsqtbsd2ks6l381b5yc8fvh0000gn/T/bench-cand-Fl5PVX/c.c:1085: incompatible types in assignment"
}
],
"symbolsUsed": [
Expand Down Expand Up @@ -25301,7 +25301,7 @@
"decompiler": "asmlift",
"candidateLabel": "unsigned",
"outcome": "nonmatch",
"source": "s32 clampu8(u32 a0) {\n if (a0 >= 0) {\n if (a0 < 256 == 0) a0 = 255;\n } else {\n a0 = 0;\n }\n return a0;\n}\n",
"source": "s32 clampu8(u32 a0) {\n if (a0 >= 0) {\n if (a0 >= 256) a0 = 255;\n } else {\n a0 = 0;\n }\n return a0;\n}\n",
"score": 8,
"maxScore": 9,
"compileErrors": null,
Expand Down Expand Up @@ -25384,17 +25384,17 @@
"asmlift": {
"decompiler": "asmlift",
"candidateLabel": "signed",
"outcome": "nonmatch",
"source": "s32 clampu8(s32 a0) {\n if (a0 < 0) {\n return 0;\n } else {\n if (a0 < 256 == 0) {\n return 255;\n } else {\n return a0;\n }\n }\n}\n",
"score": 2,
"outcome": "match",
"source": "s32 clampu8(s32 a0) {\n if (a0 < 0) {\n return 0;\n } else {\n if (a0 >= 256) {\n return 255;\n } else {\n return a0;\n }\n }\n}\n",
"score": 0,
"maxScore": 10,
"compileErrors": null,
"breakdown": {
"insert": 0,
"delete": 0,
"replace": 0,
"opMismatch": 0,
"argMismatch": 2
"argMismatch": 0
},
"quality": {
"score": 100,
Expand Down Expand Up @@ -34256,7 +34256,7 @@
"decompiler": "asmlift",
"candidateLabel": "signed",
"outcome": "match",
"source": "s32 inrange(s32 a0, s32 a1, s32 a2) {\n return (a0 < a1 ^ 1) & (a2 < a0 ^ 1);\n}\n",
"source": "s32 inrange(s32 a0, s32 a1, s32 a2) {\n return a0 >= a1 & a2 >= a0;\n}\n",
"score": 0,
"maxScore": 6,
"compileErrors": null,
Expand Down Expand Up @@ -34326,18 +34326,18 @@
"asmDump": "\ntarget.o: file format elf32-tradbigmips\n\nSYMBOL TABLE:\n00000000 l d .text\t00000020 .text\n00000000 g F .text\t00000020 inrange\n\n\nContents of section .text:\n 0000 0085102a 38420001 10400003 00000000 ...*8B...@......\n 0010 00c4102a 38420001 03e00008 00000000 ...*8B..........\nContents of section .options:\n 0000 01200000 00000000 80000074 00000000 . .........t....\n 0010 00000000 00000000 00000000 00007ff0 ................\n 0020 07100000 00000000 00000000 00000000 ................\n 0030 08100000 00000000 00000000 00000000 ................\nContents of section .reginfo:\n 0000 80000074 00000000 00000000 00000000 ...t............\n 0010 00000000 00007ff0 ........ \nContents of section .mdebug:\n 0000 7009070a 00000008 00000004 00000188 p...............\n 0010 00000005 000002cc 00000001 0000018c ................\n 0020 00000004 000001c0 00000000 00000000 ................\n 0030 00000011 000001f0 00000038 00000234 ...........8...4\n 0040 00000008 0000026c 00000001 00000274 .......l.......t\n 0050 00000000 00000000 00000001 000002bc ................\n 0060 07000000 00000000 00000001 00000000 ................\n 0070 00000000 00000000 ffffffff 00000000 ................\n 0080 00000000 00000000 001d001f 00000002 ................\n 0090 00000002 00000000 00000001 00000000 ................\n 00a0 2c200004 0000002e 00000000 1820000f , ........... ..\n 00b0 0000002e 00000020 20200001 00000001 ....... ......\n 00c0 00000000 20200000 02000000 03000000 .... ..........\n 00d0 04000000 05000000 06000000 07000000 ................\n 00e0 08000000 09000000 20000000 21000000 ........ ...!...\n 00f0 0a000000 0b000000 0b000000 1a000000 ................\n 0100 00000000 00000003 06000000 002f746d ............./tm\n 0110 702f6173 6d6c6966 742d6d69 70732d72 p/asmlift-mips-r\n 0120 65662d62 35353766 63646530 30376665 ef-b557fcde007fe\n 0130 3937632f 7265662e 6300696e 72616e67 97c/ref.c.inrang\n 0140 65000000 696e7261 6e676500 00000000 e...inrange.....\n 0150 00000001 00000000 00000036 00000000 ...........6....\n 0160 00000004 00000000 00000008 00000000 ................\n 0170 00000000 00000001 00000000 00000011 ................\n 0180 00000000 00000000 01800000 00000000 ................\n 0190 00000001 00000000 00000000 00000000 ................\n 01a0 18200001 00000000 00000000 00000000 . ..............\n 01b0 00000000 00000000 00000000 7fffffff ................\n 01c0 00000000 00000000 00000002 ............ \n",
"asmlift": {
"decompiler": "asmlift",
"candidateLabel": "signed",
"candidateLabel": "unsigned",
"outcome": "nonmatch",
"source": "s32 inrange(s32 a0, s32 a1, s32 a2) {\n s32 v0;\n if (a0 >= a1) {\n v0 = a0 < a1 ^ 1;\n } else {\n v0 = a2 < a0 ^ 1;\n }\n return v0;\n}\n",
"source": "s32 inrange(u32 a0, u32 a1, u32 a2) {\n s32 v0;\n if (a0 < a1) {\n v0 = a0 >= a1;\n } else {\n v0 = a2 >= a0;\n }\n return v0;\n}\n",
"score": 9,
"maxScore": 10,
"compileErrors": null,
"breakdown": {
"insert": 2,
"delete": 1,
"replace": 3,
"replace": 4,
"opMismatch": 0,
"argMismatch": 3
"argMismatch": 2
},
"quality": {
"score": 100,
Expand Down Expand Up @@ -51676,7 +51676,7 @@
"decompiler": "asmlift",
"candidateLabel": "unsigned",
"outcome": "nonmatch",
"source": "s32 sw_sparse(u32 a0) {\n s32 v0;\n if (a0 == 10) {\n v0 = 2;\n } else {\n if (a0 < 11 == 0) {\n if (a0 == 100) {\n v0 = 3;\n } else {\n if (a0 == 1000) {\n v0 = 4;\n } else {\n v0 = 0;\n }\n }\n } else {\n v0 = a0 == 1;\n }\n }\n return v0;\n}\n",
"source": "s32 sw_sparse(u32 a0) {\n s32 v0;\n if (a0 == 10) {\n v0 = 2;\n } else {\n if (a0 >= 11) {\n if (a0 == 100) {\n v0 = 3;\n } else {\n if (a0 == 1000) {\n v0 = 4;\n } else {\n v0 = 0;\n }\n }\n } else {\n v0 = a0 == 1;\n }\n }\n return v0;\n}\n",
"score": 19,
"maxScore": 24,
"compileErrors": null,
Expand Down
6 changes: 3 additions & 3 deletions apps/web/src/data/summary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"total": 743,
"match": {
"asmlift": 360,
"asmlift": 361,
"m2c": 342
},
"commit": "3c0f76118ae3adaebd6993e88810a83664def346",
"commit": "92b4d4019ffc6e30c7f5accaa0740669631bdf74",
"m2cCommit": "ad5c529a65ca1e5191b00a4a7b4cbfe79a7b45a0",
"dirty": true
"dirty": false
}
2 changes: 1 addition & 1 deletion apps/web/src/pages/benchmark/data/results.json
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions docs/asmlift-101.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,9 @@ enormously for retro consoles:
Simpler idioms (power-of-two division via shifts — the `half` example in Part III — multiply
strength-reduction, width casts) are expressed as **rewrite patterns as data**
([`pattern/engine.ts`](../packages/core/src/pattern/engine.ts)): serializable objects saying
"this DAG (directed-acyclic-graph) shape of operations becomes this op", each gated to the
compilers that emit it. Data, not code, so
"this DAG (directed-acyclic-graph) shape of operations becomes this op", most of them gated to
the compilers that emit them (a few, like `cmp ^ 1` → `!cmp`, are identities that hold
everywhere). Data, not code, so
that an automated loop can eventually _propose_ new patterns and have the oracle validate them.

### 2.6 Types as ranked candidates, judged by the differ
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/matching/fixtures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,8 @@ export const FIXTURES: DecompFixture[] = [

// ── Default idiom bundle (no `patterns` key = the benchmark path) ─────────────────────
// These pin that the DEFAULT bundle fires: `decompile()` with no opts.patterns applies
// DEFAULT_IDIOM_PATTERNS, each `{compilers}`-gated so one global bundle self-selects per
// target. A revert to default-off breaks the `expectPatternHits` here. (The `patterns: []`
// DEFAULT_IDIOM_PATTERNS, mostly `{compilers}`-gated so one global bundle self-selects per
// target (the boolean-negation folds are ungated — their shape is its own gate). A revert to default-off breaks the `expectPatternHits` here. (The `patterns: []`
// opt-out baseline is pinned by matching/m2.test.ts.)
{
// agbcc has no hardware divide → `x/2` lowers to `lsr#31;add;asr#1`; without the fold the
Expand Down
6 changes: 4 additions & 2 deletions packages/core/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Input is **text**, following what each target's toolchain produces:
| Option | Meaning |
| ------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `backend` | `cBackend` (default) or `pascalBackend` — values from `@asmlift/core/backend/*`. C++ is `cppBackend(spec)`, a per-function factory: it takes a `CppFnSpec` (class/method name, explicit param types, class field layouts — what a project's headers supply) and covers free and non-virtual member functions with word-sized fields; virtual dispatch, references, ctors/dtors decline |
| `patterns` | Idiom rewrite patterns. Omitted = `DEFAULT_IDIOM_PATTERNS` (each gated per compiler); `[]` = none |
| `patterns` | Idiom rewrite patterns. Omitted = `DEFAULT_IDIOM_PATTERNS` (self-selects per target: most are compiler-gated, the boolean-negation folds are universal); `[]` = none |
| `prototypes` | Callee arities + void-ness, as a real project takes them from headers — drives call-argument recovery |
| `asmData` | Optional `objdump -s -r -t` side-table; required to recover MIPS/PPC jump-table switches |
| `onGap` | `"strict"` (default): throw on any gap. `"annotate"`: emit best-effort source with `ASMLIFT_ERROR` markers; every gap is also returned in the structured `diagnostics` array (empty ⇔ gap-free) |
Expand Down Expand Up @@ -104,7 +104,9 @@ Recovered today: straight-line, if/else diamonds, natural loops (`while` / `do-w
properly nested, in-body `break`/early-`return`), comparison-tree and jump-table switches,
direct calls, constant-offset and variable-index memory (`*p`, `p[n]`, `a[i]`, struct fields),
magic-number and soft division, short-circuit booleans, width casts. Still DECLINED (loud, never
wrong code): **local stack frames** (address-taken locals / sp-as-data / live spills),
wrong code): **local stack frames** (address-taken locals / sp-as-data; MIPS models word `sp`
slots and PPC elides callee-saved save slots, so a spill/reload pair is modelled on those two —
anything the narrow models cannot honour declines),
**cross-block condition flags** on PPC (a `cmpw` whose branch lands in another block — the
capability gap behind the mwcc switch stubs), computed tail calls, PIC/`gp`/SDA global access,
switch fall-through, multi-latch/irreducible loops, floats, and 64-bit memory ops. Prototypes
Expand Down
Loading
Loading