Skip to content
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

fix: follow-up fixes after tact-lang/tact#1242 #44

Merged
merged 2 commits into from
Feb 17, 2025
Merged

fix: follow-up fixes after tact-lang/tact#1242 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6280e4d
fix: allow `DICTIGETJMP` for common layout, show bitcode for all oper…
i582 Feb 17, 2025
560b4f6
fix
i582 Feb 17, 2025
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
4 changes: 3 additions & 1 deletion src/decompiler/disasm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,9 @@ function checkLayout(opcodes: DecompiledInstruction[]): void {
const isValidLayout =
opcodes[RootLayout.instructions.SETCP].op.definition.mnemonic === "SETCP" &&
opcodes[RootLayout.instructions.DICTPUSHCONST].op.definition.mnemonic === "DICTPUSHCONST" &&
opcodes[RootLayout.instructions.DICTIGETJMPZ].op.definition.mnemonic === "DICTIGETJMPZ" &&
(opcodes[RootLayout.instructions.DICTIGETJMPZ].op.definition.mnemonic === "DICTIGETJMPZ" ||
opcodes[RootLayout.instructions.DICTIGETJMPZ].op.definition.mnemonic ===
"DICTIGETJMP") &&
opcodes[RootLayout.instructions.THROWARG].op.definition.mnemonic === "THROWARG"

if (!isValidLayout) {
Expand Down
163 changes: 57 additions & 106 deletions src/printer/assembly-writer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,32 @@ const OPCODE_RENAMES = new Map([
["PUSHINT_16", "PUSHINT"],
["PUSHINT_LONG", "PUSHINT"],
["PUSHCONT_SHORT", "PUSHCONT"],
["THROW_SHORT", "THROW"],
["THROWIFNOT_SHORT", "THROWIFNOT"],
["THROWIF_SHORT", "THROWIF"],
["CALLDICT_LONG", "CALLDICT"],

["LSHIFTDIVMODR_VAR", "LSHIFTDIVMODR"],
["LSHIFT_VAR", "LSHIFT"],
["RSHIFTR_VAR", "RSHIFTR"],
["RSHIFT_VAR", "RSHIFT"],
["MULRSHIFTC_VAR", "MULRSHIFTC"],
["MULRSHIFTR_VAR", "MULRSHIFTR"],
["MULRSHIFT_VAR", "MULRSHIFT"],
["QMULRSHIFT_VAR", "QMULRSHIFT"],
["PUSHSLICE_LONG", "PUSHSLICE"],

["LSHIFTDIVR", "LSHIFT#DIVR"],
["LSHIFTDIVMODR", "LSHIFT#DIVMODR"],
["RSHIFTRMOD", "RSHIFTR#MOD"],
["QLSHIFTDIVMODR", "QLSHIFT#DIVMODR"],
["MULRSHIFTRMOD", "MULRSHIFTR#MOD"],

["LSHIFT", "LSHIFT#"],
["RSHIFT", "RSHIFT#"],
["MULRSHIFTR", "MULRSHIFTR#"],
["MULRSHIFTC", "MULRSHIFTC#"],
["MULMODPOW2", "MULMODPOW2#"],
])

export interface AssemblyWriterOptions {
Expand Down Expand Up @@ -187,41 +210,7 @@ export class AssemblyWriter {

const firstArg = (node.arguments[0] as ScalarNode | undefined)?.value
const secondArg = (node.arguments[1] as ScalarNode | undefined)?.value
if (firstArg === undefined) {
if (opcode === "LSHIFTDIVMODR_VAR") {
return "LSHIFTDIVMODR"
}

if (opcode === "LSHIFT_VAR") {
return "LSHIFT"
}

if (opcode === "RSHIFTR_VAR") {
return "RSHIFTR"
}

if (opcode === "RSHIFT_VAR") {
return "RSHIFT"
}

if (opcode === "MULRSHIFTC_VAR") {
return "MULRSHIFTC"
}

if (opcode === "MULRSHIFTR_VAR") {
return "MULRSHIFTR"
}

if (opcode === "MULRSHIFT_VAR") {
return "MULRSHIFT"
}

if (opcode === "QMULRSHIFT_VAR") {
return "QMULRSHIFT"
}

return null
}
if (firstArg === undefined) return null

const originalInstruction = this.cp0.instructions.find(i => i.mnemonic === opcode)
if (!originalInstruction) return null
Expand Down Expand Up @@ -286,10 +275,6 @@ export class AssemblyWriter {
return `${firstArg.toString()} s() POP`
}

if (opcode === "PUSHSLICE_LONG") {
return `${firstArg.toString()} PUSHSLICE`
}

if (opcode === "XCHG_IJ" && secondArg !== undefined) {
return `s${firstArg.toString()} s${secondArg.toString()} XCHG`
}
Expand All @@ -316,36 +301,6 @@ export class AssemblyWriter {
return `${firstArg.toString()} ${opcode}#`
}

if (
opcode === "LSHIFT" ||
opcode === "RSHIFT" ||
opcode === "MULRSHIFTR" ||
opcode === "MULRSHIFTC" ||
opcode === "MULMODPOW2"
) {
return `${firstArg.toString()} ${opcode}#`
}

if (opcode === "LSHIFTDIVR") {
return `${firstArg.toString()} LSHIFT#DIVR`
}

if (opcode === "LSHIFTDIVMODR") {
return `${firstArg.toString()} LSHIFT#DIVMODR`
}

if (opcode === "RSHIFTRMOD") {
return `${firstArg.toString()} RSHIFTR#MOD`
}

if (opcode === "QLSHIFTDIVMODR") {
return `${firstArg.toString()} QLSHIFT#DIVMODR`
}

if (opcode === "MULRSHIFTRMOD") {
return `${firstArg.toString()} MULRSHIFTR#MOD`
}

if (opcode === "CALLXARGS_VAR") {
return `${firstArg.toString()} -1 CALLXARGS`
}
Expand All @@ -354,10 +309,6 @@ export class AssemblyWriter {
return `${firstArg.toString()} s() PUSH`
}

if (opcode === "THROW_SHORT") {
return `${firstArg.toString()} THROW`
}

if (opcode === "PUSHREF" && firstArg.toString().startsWith("x")) {
return `<b x${firstArg.toString().slice(1)} s, b> PUSHREF`
}
Expand Down Expand Up @@ -406,12 +357,7 @@ export class AssemblyWriter {
const specific = this.maybeSpecificWrite(node)
if (specific !== null) {
this.writer.write(specific)

if (this.options.outputBitcodeAfterInstruction) {
const space = " ".repeat(Math.max(1, 50 - this.writer.lineLength()))
this.writer.write(`${space}// 0x` + node.opcode.definition.bytecode.prefix)
}

this.writeBinaryRepresentationIfNeeded(node)
this.writer.writeLine("")
return
}
Expand Down Expand Up @@ -462,37 +408,42 @@ export class AssemblyWriter {
OPCODE_RENAMES.get(node.opcode.definition.mnemonic) ?? node.opcode.definition.mnemonic,
)

if (this.options.outputBitcodeAfterInstruction) {
// Example output
// CTOS // 0xD0
// 4 LDU // 0xD3 03
// s0 s1 XCHG // 0x0
// 1 PUSHINT // 0x7 1
// AND // 0xB0
// NEGATE // 0xA3
const space = " ".repeat(Math.max(1, 50 - this.writer.lineLength()))
this.writer.write(`${space}// 0x` + node.opcode.definition.bytecode.prefix)

node.opcode.operands.forEach(arg => {
this.writer.write(" ")
switch (arg.type) {
case "numeric":
case "ref":
case "bigint": {
this.writer.write(arg.bitcode.toString())
break
}
case "subslice": {
this.writer.write(arg.value.bits.toString())
break
}
}
})
}
this.writeBinaryRepresentationIfNeeded(node)

this.writer.writeLine("")
}

private writeBinaryRepresentationIfNeeded(node: InstructionNode): void {
if (!this.options.outputBitcodeAfterInstruction) return

// Example output
// CTOS // 0xD0
// 4 LDU // 0xD3 03
// s0 s1 XCHG // 0x0 1
// 1 PUSHINT // 0x7 1
// AND // 0xB0
// NEGATE // 0xA3

const space = " ".repeat(Math.max(1, 50 - this.writer.lineLength()))
this.writer.write(`${space}// 0x` + node.opcode.definition.bytecode.prefix)

node.opcode.operands.forEach(arg => {
this.writer.write(" ")
switch (arg.type) {
case "numeric":
case "ref":
case "bigint": {
this.writer.write(arg.bitcode.toString())
break
}
case "subslice": {
this.writer.write(arg.value.bits.toString())
break
}
}
})
}

protected writeNode(
node: ProgramNode | MethodNode | ProcedureNode | BlockNode | InstructionNode,
top: boolean = false,
Expand Down
Loading