Fix some compatibility issues with newer systems.

GJDuck · GJDuck · commit 29a876691191 · 2021-09-14T20:30:31.000-07:00
Fix #24 Fix #21
diff --git a/Makefile b/Makefile
@@ -54,15 +54,13 @@ tool.debug: e9tool.o
 
 loader_elf:
 	$(CXX) -std=c++11 -Wall -fno-stack-protector -Wno-unused-function -fPIC \
-        -mno-mmx -mno-sse -mno-avx -mno-avx2 -mno-avx512f -msoft-float \
         -Os -c src/e9patch/e9loader_elf.cpp
 	$(CXX) -pie -nostdlib -o e9loader_elf.bin e9loader_elf.o -T e9loader.ld
 	xxd -i e9loader_elf.bin > src/e9patch/e9loader_elf.c
 
 loader_pe:
 	$(CXX) -std=c++11 -Wall -fno-stack-protector -Wno-unused-function -fPIC \
         -mabi=ms -fshort-wchar \
-        -mno-mmx -mno-sse -mno-avx -mno-avx2 -mno-avx512f -msoft-float \
         -Os -c src/e9patch/e9loader_pe.cpp
 	$(CXX) -pie -nostdlib -o e9loader_pe.bin e9loader_pe.o -T e9loader.ld
 	xxd -i e9loader_pe.bin > src/e9patch/e9loader_pe.c
diff --git a/e9loader.ld b/e9loader.ld
@@ -1,5 +1,7 @@
 SECTIONS
 {
-	.text : { *(.text .rodata .rodata.* .data .data.*) }
+    .text : { *(.text.entry)
+              *(.text .rodata .rodata.* .data .data.*) }
+    /DISCARD/ : { *(*) }
 }
 OUTPUT_FORMAT(binary)
diff --git a/src/e9patch/e9elf.cpp b/src/e9patch/e9elf.cpp
@@ -150,7 +150,7 @@ bool parseElf(Binary *B)
             {
                 intptr_t vstart = (intptr_t)phdr->p_vaddr;
                 intptr_t vend   = vstart + phdr->p_memsz;
-                if (!reserve(B, vstart, vend))
+                if (vend - vstart > 0 && !reserve(B, vstart, vend))
                     error("failed to reserve address space range %p..%p",
                         vstart, vend);
                 break;
diff --git a/src/e9patch/e9loader_elf.cpp b/src/e9patch/e9loader_elf.cpp
@@ -50,6 +50,7 @@ asm (
      */
     ".globl _entry\n"
     ".type _entry,@function\n"
+    ".section .text.entry,\"x\",@progbits\n"
     "_entry:\n"
     "\tcallq e9loader\n"
     "\tpop %rdx\n"
@@ -59,6 +60,7 @@ asm (
 
     ".globl e9syscall\n"
     ".type e9syscall,@function\n"
+    ".section .text\n"
     "e9syscall:\n"
     "\tmov %edi, %eax\n"
     "\tmov %rsi, %rdi\n"
diff --git a/test/regtest/example_5.exp b/test/regtest/example_5.exp
@@ -1,56 +1,56 @@
-0000000094949494:00000000a5a5a5a5:00000000b6b6b6b6: 48 8b 05 5e 00 00 00    movq 0x5e(%rip), %rax
-0000000094949494:00000000a5a5a5a5:00000000b6b6b6b6: 48 bb 11 22 33 44 55 66 mov $0x8877665544332211, %rbx
+0000000094949494:00000000c7c7c7c7:00000000b6b6b6b6: 48 8b 05 5e 00 00 00    movq 0x5e(%rip), %rax
+0000000094949494:00000000c7c7c7c7:00000000b6b6b6b6: 48 bb 11 22 33 44 55 66 mov $0x8877665544332211, %rbx
                                                     77 88 
-0000000094949494:00000000a5a5a5a5:00000000b6b6b6b6: 48 39 c3                cmp %rax, %rbx
-0000000094949494:00000000a5a5a5a5:00000000b6b6b6b6: 0f 1f 00                nopl %eax, (%rax)
-0000000094949494:00000000a5a5a5a5:00000000b6b6b6b6: 83 fb 33                cmp $0x33, %ebx
-0000000094949494:00000000a5a5a5a5:00000000b6b6b6b6: 4c 8b 05 28 00 00 00    movq 0x28(%rip), %r8
-0000000094949494:00000000a5a5a5a5:00000000b6b6b6b6: 48 8b 0d 9a 01 00 00    movq 0x19a(%rip), %rcx
-0000000094949494:00000000a5a5a5a5:00000000b6b6b6b6: 4c 39 c1                cmp %r8, %rcx
-0000000094949494:00000000a5a5a5a5:00000000b6b6b6b6: 0f 1f 40 00             nopl %eax, (%rax)
-0000000094949494:00000000a5a5a5a5:00000000b6b6b6b6: 4c 8d 15 14 00 00 00    lea 0x14(%rip), %r10
-000000000a000192:00000000a5a5a5a5:00000000b6b6b6b6: 48 c7 c1 89 88 ff ff    mov $-0x7777, %rcx
-000000000a000192:00000000a5a5a5a5:00000000b6b6b6b6: 48 83 c4 08             add $0x8, %rsp
-000000000a000192:00000000a5a5a5a5:00000000b6b6b6b6: 48 8d 15 02 00 00 00    lea 0x2(%rip), %rdx
-000000000a000192:00000000a5a5a5a5:00000000b6b6b6b6: 49 83 c1 06             add $0x6, %r9
-000000000a000192:00000000a5a5a5a5:00000000b6b6b6b6: 4d 01 ca                add %r9, %r10
-000000008d83851b:00000000a5a5a5a5:00000000b6b6b6b6: 49 83 e8 08             sub $0x8, %r8
-000000008d83851b:00000000a5a5a5a5:00000000b6b6b6b6: 4d 29 c2                sub %r8, %r10
-778899ab49506312:00000000a5a5a5a5:00000000b6b6b6b6: 4d 0f af d3             imul %r11, %r10
-87bd82518544749a:00000000a5a5a5a5:00000000b6b6b6b6: 4d 6b d3 77             imul $0x77, %r11, %r10
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 25 fe 00 00 00       and $0xfe, %rax
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 21 c3                and %rax, %rbx
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 83 cb 13             or $0x13, %rbx
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 09 cb                or %rcx, %rbx
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 c1 e7 07             shl $0x7, %rdi
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 c1 ff 03             sar $0x3, %rdi
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 c7 c0 19 45 00 00    mov $0x4519, %rax
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 66 0f ef c0             pxor %xmm0, %xmm0
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: f3 48 0f 2a c0          cvtsi2ss %rax, %xmm0
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: f3 0f 51 c8             sqrtss %xmm0, %xmm1
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 0f 2f c8                comiss %xmm0, %xmm1
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: f3 48 0f 2c c1          cvttss2si %xmm1, %rax
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 3d 85 00 00 00       cmp $0x85, %rax
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 8b 84 24 00 ff ff ff movq -0x100(%rsp), %rax
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 85 c0                test %rax, %rax
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 31 f6                   xor %esi, %esi
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 8b 84 f4 00 ff ff ff movq -0x100(%rsp,%rsi,8), %rax
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 85 c0                test %rax, %rax
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 2e 48 8b 84 f4 00 ff ff movq %cs:-0x100(%rsp,%rsi,8), %rax
+0000000094949494:00000000c7c7c7c7:00000000b6b6b6b6: 48 39 c3                cmp %rax, %rbx
+0000000094949494:00000000c7c7c7c7:00000000b6b6b6b6: 0f 1f 00                nopl %eax, (%rax)
+0000000094949494:00000000c7c7c7c7:00000000b6b6b6b6: 83 fb 33                cmp $0x33, %ebx
+0000000094949494:00000000c7c7c7c7:00000000b6b6b6b6: 4c 8b 05 28 00 00 00    movq 0x28(%rip), %r8
+0000000094949494:00000000c7c7c7c7:00000000b6b6b6b6: 48 8b 0d 9a 01 00 00    movq 0x19a(%rip), %rcx
+0000000094949494:00000000c7c7c7c7:00000000b6b6b6b6: 4c 39 c1                cmp %r8, %rcx
+0000000094949494:00000000c7c7c7c7:00000000b6b6b6b6: 0f 1f 40 00             nopl %eax, (%rax)
+0000000094949494:00000000c7c7c7c7:00000000b6b6b6b6: 4c 8d 15 14 00 00 00    lea 0x14(%rip), %r10
+000000000a000192:00000000c7c7c7c7:00000000b6b6b6b6: 48 c7 c1 89 88 ff ff    mov $-0x7777, %rcx
+000000000a000192:00000000c7c7c7c7:00000000b6b6b6b6: 48 83 c4 08             add $0x8, %rsp
+000000000a000192:00000000c7c7c7c7:00000000b6b6b6b6: 48 8d 15 02 00 00 00    lea 0x2(%rip), %rdx
+000000000a000192:00000000c7c7c7c7:00000000b6b6b6b6: 49 83 c1 06             add $0x6, %r9
+000000000a000192:00000000c7c7c7c7:00000000b6b6b6b6: 4d 01 ca                add %r9, %r10
+000000008d83851b:00000000c7c7c7c7:00000000b6b6b6b6: 49 83 e8 08             sub $0x8, %r8
+000000008d83851b:00000000c7c7c7c7:00000000b6b6b6b6: 4d 29 c2                sub %r8, %r10
+778899ab49506312:00000000c7c7c7c7:00000000b6b6b6b6: 4d 0f af d3             imul %r11, %r10
+87bd82518544749a:00000000c7c7c7c7:00000000b6b6b6b6: 4d 6b d3 77             imul $0x77, %r11, %r10
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 25 fe 00 00 00       and $0xfe, %rax
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 21 c3                and %rax, %rbx
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 83 cb 13             or $0x13, %rbx
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 09 cb                or %rcx, %rbx
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 c1 e7 07             shl $0x7, %rdi
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 c1 ff 03             sar $0x3, %rdi
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 c7 c0 19 45 00 00    mov $0x4519, %rax
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 66 0f ef c0             pxor %xmm0, %xmm0
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: f3 48 0f 2a c0          cvtsi2ss %rax, %xmm0
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: f3 0f 51 c8             sqrtss %xmm0, %xmm1
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 0f 2f c8                comiss %xmm0, %xmm1
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: f3 48 0f 2c c1          cvttss2si %xmm1, %rax
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 3d 85 00 00 00       cmp $0x85, %rax
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 8b 84 24 00 ff ff ff movq -0x100(%rsp), %rax
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 85 c0                test %rax, %rax
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 31 f6                   xor %esi, %esi
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 8b 84 f4 00 ff ff ff movq -0x100(%rsp,%rsi,8), %rax
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 85 c0                test %rax, %rax
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 2e 48 8b 84 f4 00 ff ff movq %cs:-0x100(%rsp,%rsi,8), %rax
                                                     ff 
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 3e 48 8b 8c f4 00 ff ff movq %ds:-0x100(%rsp,%rsi,8), %rcx
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 3e 48 8b 8c f4 00 ff ff movq %ds:-0x100(%rsp,%rsi,8), %rcx
                                                     ff 
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 39 c1                cmp %rax, %rcx
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 8b 0c 25 00 00 00 0a    movl 0xa000000, %ecx
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 8b 8c f0 00 00 00 0a movq 0xa000000(%rax,%rsi,8), %rcx
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 8b 14 f5 00 00 00 0a movq 0xa000000(,%rsi,8), %rdx
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 39 ca                cmp %rcx, %rdx
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 8b 14 25 08 00 00 0a movq 0xa000008, %rdx
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 39 ca                cmp %rcx, %rdx
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 31 c0                   xor %eax, %eax
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 89 c7                   mov %eax, %edi
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 8d 35 54 00 00 00    lea 0x54(%rip), %rsi
-0000004cffffffb3:00000000a5a5a5a5:00000000b6b6b6b6: 48 c7 c2 07 00 00 00    mov $0x7, %rdx
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 39 c1                cmp %rax, %rcx
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 8b 0c 25 00 00 00 0a    movl 0xa000000, %ecx
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 8b 8c f0 00 00 00 0a movq 0xa000000(%rax,%rsi,8), %rcx
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 8b 14 f5 00 00 00 0a movq 0xa000000(,%rsi,8), %rdx
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 39 ca                cmp %rcx, %rdx
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 8b 14 25 08 00 00 0a movq 0xa000008, %rdx
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 39 ca                cmp %rcx, %rdx
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 31 c0                   xor %eax, %eax
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 89 c7                   mov %eax, %edi
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 8d 35 54 00 00 00    lea 0x54(%rip), %rsi
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 48 c7 c2 07 00 00 00    mov $0x7, %rdx
 PASSED
-0000004cffffffb3:0000000000000202:00000000b6b6b6b6: b8 3c 00 00 00          mov $0x3c, %eax
-0000004cffffffb3:0000000000000202:00000000b6b6b6b6: 31 ff                   xor %edi, %edi
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: b8 3c 00 00 00          mov $0x3c, %eax
+0000004cffffffb3:00000000c7c7c7c7:00000000b6b6b6b6: 31 ff                   xor %edi, %edi
diff --git a/test/regtest/example_5.in b/test/regtest/example_5.in
@@ -1 +1 @@
-./test -M 'op.size > 1' -A 'call entry(r10,r11,r12,instr,size,asm)@inst'
+./test -M 'op.size > 1' -A 'call entry(r10,r13,r12,instr,size,asm)@inst'
diff --git a/test/regtest/regtest.cpp b/test/regtest/regtest.cpp
@@ -123,6 +123,10 @@ static bool runTest(const struct dirent *test, const std::string &options)
             r, out.c_str());
         return false;
     }
+    command.clear();
+    command = "sed -i 's/ (core dumped)//g' ";
+    command += out;
+    system(command.c_str());
 
     // Step (3): compare the output
     FILE *OUT = fopen(out.c_str(), "r");
diff --git a/test/regtest/test.s b/test/regtest/test.s
@@ -237,6 +237,7 @@ data_END:
     lea .Lstring(%rip),%rsi
     mov $7, %rdx
     syscall
+    # Note: %r11 is undefined after syscall
 
     mov $60,%eax    # SYS_exit
     xor %edi,%edi

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`SECTIONS`
`2`	`2`	`{`
`3`		`- .text : { (.text .rodata .rodata. .data .data.*) }`
	`3`	`+ .text : { *(.text.entry)`
	`4`	`+ (.text .rodata .rodata. .data .data.*) }`
	`5`	`+ /DISCARD/ : { () }`
`4`	`6`	`}`
`5`	`7`	`OUTPUT_FORMAT(binary)`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ bool parseElf(Binary *B)`
`150`	`150`	`{`
`151`	`151`	`intptr_t vstart = (intptr_t)phdr->p_vaddr;`
`152`	`152`	`intptr_t vend = vstart + phdr->p_memsz;`
`153`		`- if (!reserve(B, vstart, vend))`
	`153`	`+ if (vend - vstart > 0 && !reserve(B, vstart, vend))`
`154`	`154`	`error("failed to reserve address space range %p..%p",`
`155`	`155`	`vstart, vend);`
`156`	`156`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-./test -M 'op.size > 1' -A 'call entry(r10,r11,r12,instr,size,asm)@inst'`
	`1`	`+./test -M 'op.size > 1' -A 'call entry(r10,r13,r12,instr,size,asm)@inst'`