diff options
author | Kartik Agaram <github@akkartik.com> | 2019-05-18 00:46:19 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-18 00:46:19 -0700 |
commit | 11e725f277d08031d6b18599612a7bbddac050cd (patch) | |
tree | cf52127783efc20bbe8d903d96e73bc51a1f752d /subx/019functions.cc | |
parent | 72853d07bb3cfed09f57ee36b582f8f35fee74e4 (diff) | |
parent | 83c67014034bbf9072d7e4555b0e51e815a95756 (diff) | |
download | mu-11e725f277d08031d6b18599612a7bbddac050cd.tar.gz |
Merge pull request #33 from akkartik/new-segment-header
New syntax for segment headers
Diffstat (limited to 'subx/019functions.cc')
-rw-r--r-- | subx/019functions.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/subx/019functions.cc b/subx/019functions.cc index 00da8397..81e99e6e 100644 --- a/subx/019functions.cc +++ b/subx/019functions.cc @@ -8,7 +8,7 @@ void test_call_disp32() { Mem.push_back(vma(0xbd000000)); // manually allocate memory Reg[ESP].u = 0xbd000064; run( - "== 0x1\n" // code segment + "== code 0x1\n" // op ModR/M SIB displacement immediate " e8 a0 00 00 00 \n" // call function offset at 0x000000a0 // next EIP is 6 @@ -41,7 +41,7 @@ void test_call_r32() { Reg[ESP].u = 0xbd000064; Reg[EBX].u = 0x000000a0; run( - "== 0x1\n" // code segment + "== code 0x1\n" // op ModR/M SIB displacement immediate " ff d3 \n" // call function offset at EBX // next EIP is 3 @@ -72,11 +72,11 @@ void test_call_mem_at_r32() { Reg[ESP].u = 0xbd000064; Reg[EBX].u = 0x2000; run( - "== 0x1\n" // code segment + "== code 0x1\n" // op ModR/M SIB displacement immediate " ff 13 \n" // call function offset at *EBX // next EIP is 3 - "== 0x2000\n" // data segment + "== data 0x2000\n" "a0 00 00 00\n" // 0x000000a0 ); CHECK_TRACE_CONTENTS( @@ -99,10 +99,10 @@ void test_ret() { Reg[ESP].u = 0xbd000064; write_mem_u32(Reg[ESP].u, 0x10); run( - "== 0x1\n" // code segment + "== code 0x1\n" // op ModR/M SIB displacement immediate " c3 \n" // return - "== 0x2000\n" // data segment + "== data 0x2000\n" "10 00 00 00\n" // 0x00000010 ); CHECK_TRACE_CONTENTS( |