Use template-style syntax to select call ABI

GJDuck · GJDuck · commit c994a3d7709e · 2021-10-28T19:07:12.000+08:00
e.g.: f&lt;naked&gt;(...)
diff --git a/src/e9tool/e9tool.cpp b/src/e9tool/e9tool.cpp
@@ -1234,11 +1234,12 @@ static Patch *parsePatch(const ELF &elf, const char *str)
         
         case PATCH_CALL:
         {
-            t = parser.expectToken2('(', '.');
-            if (t == '.')
+            t = parser.expectToken2('(', '<');
+            if (t == '<')
             {
                 t = parser.expectToken2(TOKEN_CLEAN, TOKEN_NAKED);
                 abi = (t == TOKEN_CLEAN? ABI_CLEAN: ABI_NAKED);
+                parser.expectToken('>');
                 parser.expectToken('(');
             }
             while (true)
diff --git a/test/regtest/clean.exp b/test/regtest/clean.exp
@@ -0,0 +1,32 @@
+push %r15
+movq 0x5e(%rip), %rax
+cmp %rax, %rbx
+nop
+nopl %eax, (%rax)
+cmp $0x33, %ebx
+movq 0x28(%rip), %r8
+movq 0x19a(%rip), %rcx
+cmp %r8, %rcx
+nopl %eax, (%rax)
+jmp 0xa000163
+jmp 0xa00016d
+jmp 0xa000177
+lea 0x14(%rip), %r10
+push %r10
+push %r11
+jmpq *0x777f(%rsp,%rcx,1)
+add $0x8, %rsp
+lea 0x2(%rip), %rdx
+pop %r14
+push %r13
+pxor %xmm0, %xmm0
+cmp $0x85, %rax
+movq -0x100(%rsp), %rax
+movq -0x100(%rsp,%rsi,8), %rax
+movq %cs:-0x100(%rsp,%rsi,8), %rax
+movq %ds:-0x100(%rsp,%rsi,8), %rcx
+cmp %rax, %rcx
+cmp %rcx, %rdx
+cmp %rcx, %rdx
+lea 0x54(%rip), %rsi
+PASSED
diff --git a/test/regtest/clean.in b/test/regtest/clean.in
@@ -0,0 +1 @@
+./test -M 'asm=.*p.*' -P 'naked<clean>(asm)@patch'
diff --git a/test/regtest/naked.in b/test/regtest/naked.in
@@ -1 +1 @@
-./test -M true -P 'naked.naked(asm)@patch'
+./test -M true -P 'naked<naked>(asm)@patch'
diff --git a/test/regtest/naked_2.in b/test/regtest/naked_2.in
@@ -1 +1 @@
-./test -M true -P 'naked.naked(asm,state,rsp,rax,&rax,trampoline,target,next)@patch'
+./test -M true -P 'naked<naked>(asm,state,rsp,rax,&rax,trampoline,target,next)@patch'
diff --git a/test/regtest/naked_3.in b/test/regtest/naked_3.in
@@ -1 +1 @@
-./test -M true -P 'if ret_0x0.naked(asm,state,rsp,rax,&rax,trampoline,target,next)@patch break'
+./test -M true -P 'if ret_0x0<naked>(asm,state,rsp,rax,&rax,trampoline,target,next)@patch break'
diff --git a/test/regtest/naked_4.in b/test/regtest/naked_4.in
@@ -1 +1 @@
-./test -M true -P 'nop.naked(op[0],op[1],op[2],&op[0],&op[1],&op[2],state,addr)@patch'
+./test -M true -P 'nop<naked>(op[0],op[1],op[2],&op[0],&op[1],&op[2],state,addr)@patch'
diff --git a/test/regtest/naked_bug.in b/test/regtest/naked_bug.in
@@ -1 +1 @@
-./test -M 'rax in regs' -P 'naked_bug.naked(rax,state)@patch'
+./test -M 'rax in regs' -P 'naked_bug<naked>(rax,state)@patch'

Original file line number	Diff line number	Diff line change
`@@ -1234,11 +1234,12 @@ static Patch parsePatch(const ELF &elf, const char str)`
`1234`	`1234`
`1235`	`1235`	`case PATCH_CALL:`
`1236`	`1236`	`{`
`1237`		`- t = parser.expectToken2('(', '.');`
`1238`		`- if (t == '.')`
	`1237`	`+ t = parser.expectToken2('(', '<');`
	`1238`	`+ if (t == '<')`
`1239`	`1239`	`{`
`1240`	`1240`	`t = parser.expectToken2(TOKEN_CLEAN, TOKEN_NAKED);`
`1241`	`1241`	`abi = (t == TOKEN_CLEAN? ABI_CLEAN: ABI_NAKED);`
	`1242`	`+ parser.expectToken('>');`
`1242`	`1243`	`parser.expectToken('(');`
`1243`	`1244`	`}`
`1244`	`1245`	`while (true)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+./test -M 'asm=.p.' -P 'naked<clean>(asm)@patch'`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-./test -M true -P 'naked.naked(asm)@patch'`
	`1`	`+./test -M true -P 'naked<naked>(asm)@patch'`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-./test -M true -P 'naked.naked(asm,state,rsp,rax,&rax,trampoline,target,next)@patch'`
	`1`	`+./test -M true -P 'naked<naked>(asm,state,rsp,rax,&rax,trampoline,target,next)@patch'`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-./test -M true -P 'if ret_0x0.naked(asm,state,rsp,rax,&rax,trampoline,target,next)@patch break'`
	`1`	`+./test -M true -P 'if ret_0x0<naked>(asm,state,rsp,rax,&rax,trampoline,target,next)@patch break'`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-./test -M true -P 'nop.naked(op[0],op[1],op[2],&op[0],&op[1],&op[2],state,addr)@patch'`
	`1`	`+./test -M true -P 'nop<naked>(op[0],op[1],op[2],&op[0],&op[1],&op[2],state,addr)@patch'`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-./test -M 'rax in regs' -P 'naked_bug.naked(rax,state)@patch'`
	`1`	`+./test -M 'rax in regs' -P 'naked_bug<naked>(rax,state)@patch'`