Skip to content

feat: remove the not really necessary xchgArgs Args variant #16

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
merged 1 commit into from
Oct 15, 2025
Merged

feat: remove the not really necessary xchgArgs Args variant #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 0 additions & 9 deletions src/generator/gen-constructors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,22 +104,13 @@ const generateArgs = (args: $.args): CompiledArgs => {
switch (args.$) {
case "simpleArgs":
return generateSimpleArgs(args)
case "xchgArgs":
return generateXchgArgs(args)
case "dictpush":
return generateDictpush(args)
}

throw new Error("Unexpected arg type")
}

const generateXchgArgs = (_args: $.xchgArgs): CompiledArgs => {
return [
["arg0", t.tsNumberKeyword()],
["arg1", t.tsNumberKeyword()],
]
}

const generateDictpush = (_args: $.dictpush): CompiledArgs => {
return [
// TODO: rename parameters
Expand Down
24 changes: 0 additions & 24 deletions src/generator/gen-converter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,6 @@ const argsLen = (args: $.args): number => {
switch (args.$) {
case "simpleArgs":
return args.children.length
case "xchgArgs":
return 2
case "dictpush":
return 2
}
Expand Down Expand Up @@ -405,32 +403,10 @@ const generateDictpush = (name: string): t.Statement[] => {
]
}

const generateXchgArgs = (name: string): t.Statement[] => {
return [
t.variableDeclaration("const", [
t.variableDeclarator(
t.identifier("args"),
t.callExpression(t.memberExpression(UTIL_QUALIFIER, t.identifier("twoStackArgs")), [
t.identifier("instr"),
]),
),
]),
t.returnStatement(
t.callExpression(t.memberExpression(RUNTIME_QUALIFIER, t.identifier(name)), [
t.memberExpression(t.identifier("args"), t.numericLiteral(0), true),
t.memberExpression(t.identifier("args"), t.numericLiteral(1), true),
t.identifier("loc"),
]),
),
]
}

const generateArgs = (name: string, args: $.args): t.Statement[] => {
switch (args.$) {
case "simpleArgs":
return generateSimpleArgs(name, args.children)
case "xchgArgs":
return generateXchgArgs(name)
case "dictpush":
return generateDictpush(name)
}
Expand Down
14 changes: 0 additions & 14 deletions src/generator/gen-printer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@ const argsLen = (args: $.args): number => {
switch (args.$) {
case "simpleArgs":
return args.children.length
case "xchgArgs":
return 2
case "dictpush":
return 2
}
Expand Down Expand Up @@ -218,22 +216,10 @@ const generateDictpush = (): t.Statement[] => {
]
}

const generateXchgArgs = (): t.Statement[] => {
return [
writeAppend("s"),
writeToString("arg0"),
writeAppend(" "),
writeAppend("s"),
writeToString("arg1"),
]
}

const generateArgs = (args: $.args): t.Statement[] => {
switch (args.$) {
case "simpleArgs":
return generateSimpleArgs(args.children)
case "xchgArgs":
return generateXchgArgs()
case "dictpush":
return generateDictpush()
}
Expand Down
16 changes: 0 additions & 16 deletions src/generator/gen-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,6 @@ const generateLoadArgs = (args: $.args): (t.Expression | t.SpreadElement)[] => {
switch (args.$) {
case "simpleArgs":
return generateSimpleArgs(args).map(arg => wrapIntoLoad(arg))
case "xchgArgs":
return generateXchgArgs(args).map(arg => wrapIntoLoad(arg))
case "dictpush":
return generateDictpush(args).map(arg => t.spreadElement(wrapIntoLoad(arg)))
}
Expand All @@ -176,8 +174,6 @@ const generateStoreArgs = (args: $.args): t.Statement[] => {
switch (args.$) {
case "simpleArgs":
return generateSimpleArgs(args).map((arg, index) => wrapIntoStore(`arg${index}`, arg))
case "xchgArgs":
return generateXchgArgs(args).map((arg, index) => wrapIntoStore(`arg${index}`, arg))
case "dictpush":
return [
wrapIntoArrayStore(
Expand All @@ -190,18 +186,6 @@ const generateStoreArgs = (args: $.args): t.Statement[] => {
throw new Error("Unexpected arg type")
}

// uint(4), uint(4)
const generateXchgArgs = (_args: $.xchgArgs): t.Expression[] => {
return [
t.callExpression(t.memberExpression(UTIL_QUALIFIER, t.identifier("uint")), [
t.numericLiteral(4),
]),
t.callExpression(t.memberExpression(UTIL_QUALIFIER, t.identifier("uint")), [
t.numericLiteral(4),
]),
]
}

// codeSlice(uint(2), uint(7))
const generateCodeSlice = (args: $.codeSlice): t.Expression => {
return t.callExpression(t.memberExpression(UTIL_QUALIFIER, t.identifier("codeSlice")), [
Expand Down
7 changes: 2 additions & 5 deletions src/generator/instructions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,11 @@ export const hash: hash = {$: "hash"}
export type setcpArg = {$: "setcpArg", range: range}
export const setcpArg: setcpArg = {$: "setcpArg", range: range(-15n, 239n)}

export type args = simpleArgs | xchgArgs | dictpush
export type args = simpleArgs | dictpush

export type simpleArgs = {$: "simpleArgs", children: arg[]}
export const seq = (...args: arg[]): simpleArgs => ({$: "simpleArgs", children: args})

export type xchgArgs = {$: "xchgArgs", range: range}
export const xchgArgs: xchgArgs = {$: "xchgArgs", range: range(1n, 16n)}

export type codeSlice = {$: "codeSlice", refs: arg, bits: arg}
export const codeSlice = (refs: arg, bits: arg): codeSlice => ({$: "codeSlice", refs, bits})

Expand Down Expand Up @@ -1289,7 +1286,7 @@ export const instructions: Record<string, Opcode> = {

XCHG_0I_LONG: cat("stack", mkfixedn(0x11, 8, 8, seq(stack2(8, 1n)), `exec_xchg0_l`)),
XCHG_0I: cat("stack", mkfixedrangen(0x02, 0x10, 8, 4, seq(stack2(4, 1n)), `exec_xchg0`)),
XCHG_IJ: cat("stack", mkfixedn(0x10, 8, 8, xchgArgs, `exec_xchg`)),
XCHG_IJ: cat("stack", mkfixedn(0x10, 8, 8, seq(stack2(4, 1n), stack(4)), `exec_xchg`)),
XCHG_1I: cat("stack", mkfixedrangen(0x12, 0x20, 8, 4, seq(s1, stack2(4, 2n)), `exec_xchg1`)),

// special case: opcode with holes
Expand Down