+ added test tasm18h.pp: same as tasm18.pp and tasm18g.pp, but for x86_64

git-svn-id: trunk@38232 -

.gitattributes

@@ -12509,6 +12509,7 @@ tests/test/tasm18d.pp svneol=native#text/plain
 tests/test/tasm18e.pp svneol=native#text/plain
 tests/test/tasm18f.pp svneol=native#text/plain
 tests/test/tasm18g.pp svneol=native#text/plain
+tests/test/tasm18h.pp svneol=native#text/plain
 tests/test/tasm2.inc svneol=native#text/plain
 tests/test/tasm2.pp svneol=native#text/plain
 tests/test/tasm2a.pp svneol=native#text/plain

tests/test/tasm18h.pp

@@ -0,0 +1,178 @@
+{ %CPU=x86_64 }
+program tasm18h;
+
+{$asmmode intel}
+{$packrecords 1}
+
+const
+  cval = 1;
+
+type
+  foo = record
+    b1: byte;
+    w: word;
+    b2: byte;
+  end;
+  foo2 = record
+    bb1, bb2: byte;
+  end;
+  foo32 = record
+    b1, b2, b3, b4: byte;
+  end;
+  foo32_2 = record
+    b1: byte;
+    l: longint;
+  end;
+
+const
+  expect1: array [0..$CF] of byte = (
+    $66,$F7,$07,$01,$00,      { TEST    WORD PTR [RDI],0001    }
+    $F6,$07,$01,              { TEST    BYTE PTR [RDI],01      }
+    $66,$F7,$47,$01,$01,$00,  { TEST    WORD PTR [RDI+01],0001 }
+    $F6,$47,$03,$01,          { TEST    BYTE PTR [RDI+03],01   }
+    $66,$F7,$47,$FF,$01,$00,  { TEST    WORD PTR [RDI-01],0001 }
+    $F6,$47,$FD,$01,          { TEST    BYTE PTR [RDI-03],01   }
+    $66,$F7,$47,$04,$01,$00,  { TEST    WORD PTR [RDI+04],0001 }
+    $F6,$47,$04,$01,          { TEST    BYTE PTR [RDI+04],01   }
+
+    $66,$F7,$07,$01,$00,      { TEST    WORD PTR [RDI],0001    }
+    $F6,$07,$01,              { TEST    BYTE PTR [RDI],01      }
+    $66,$F7,$47,$01,$01,$00,  { TEST    WORD PTR [RDI+01],0001 }
+    $F6,$47,$03,$01,          { TEST    BYTE PTR [RDI+03],01   }
+    $66,$F7,$47,$FF,$01,$00,  { TEST    WORD PTR [RDI-01],0001 }
+    $F6,$47,$FD,$01,          { TEST    BYTE PTR [RDI-03],01   }
+    $66,$F7,$47,$04,$01,$00,  { TEST    WORD PTR [RDI+04],0001 }
+    $F6,$47,$04,$01,          { TEST    BYTE PTR [RDI+04],01   }
+
+    $66,$F7,$07,$01,$00,      { TEST    WORD PTR [RDI],0001    }
+    $F6,$07,$01,              { TEST    BYTE PTR [RDI],01      }
+    $66,$F7,$47,$05,$01,$00,  { TEST    WORD PTR [RDI+05],0001 }
+    $F6,$47,$0F,$01,          { TEST    BYTE PTR [RDI+0F],01   }
+    $66,$F7,$47,$FB,$01,$00,  { TEST    WORD PTR [RDI-05],0001 }
+    $F6,$47,$F1,$01,          { TEST    BYTE PTR [RDI-0F],01   }
+    $66,$F7,$47,$12,$01,$00,  { TEST    WORD PTR [RDI+12],0001 }
+    $F6,$47,$0E,$01,          { TEST    BYTE PTR [RDI+0E],01   }
+
+    $F6,$07,$01,              { TEST    BYTE PTR [RDI],01      }
+    $F6,$07,$01,              { TEST    BYTE PTR [RDI],01      }
+    $F6,$47,$01,$01,          { TEST    BYTE PTR [RDI+01],01   }
+    $F6,$47,$03,$01,          { TEST    BYTE PTR [RDI+03],01   }
+    $F6,$47,$FF,$01,          { TEST    BYTE PTR [RDI-01],01   }
+    $F6,$47,$FD,$01,          { TEST    BYTE PTR [RDI-03],01   }
+    $F6,$47,$04,$01,          { TEST    BYTE PTR [RDI+04],01   }
+    $F6,$47,$04,$01,          { TEST    BYTE PTR [RDI+04],01   }
+    $F6,$07,$01,              { TEST    BYTE PTR [RDI],01      }
+    $F6,$47,$01,$01,          { TEST    BYTE PTR [RDI+01],01   }
+
+    $66,$F7,$07,$01,$00,      { TEST    WORD PTR [RDI],0001    }
+    $66,$F7,$07,$01,$00,      { TEST    WORD PTR [RDI],0001    }
+    $66,$F7,$47,$01,$01,$00,  { TEST    WORD PTR [RDI+01],0001 }
+    $66,$F7,$47,$03,$01,$00,  { TEST    WORD PTR [RDI+03],0001 }
+    $66,$F7,$47,$FF,$01,$00,  { TEST    WORD PTR [RDI-01],0001 }
+    $66,$F7,$47,$FD,$01,$00,  { TEST    WORD PTR [RDI-03],0001 }
+    $66,$F7,$47,$04,$01,$00,  { TEST    WORD PTR [RDI+04],0001 }
+    $66,$F7,$47,$04,$01,$00,  { TEST    WORD PTR [RDI+04],0001 }
+    $66,$F7,$07,$01,$00,      { TEST    WORD PTR [RDI],0001    }
+    $66,$F7,$47,$01,$01,$00   { TEST    WORD PTR [RDI+01],0001 }
+  );
+  expect2: array [0..$42] of byte = (
+    $F7,$07,$01,$00,$00,$00,      { TEST    DWORD PTR [RDI],00000001    }
+    $F7,$47,$01,$01,$00,$00,$00,  { TEST    DWORD PTR [RDI+01],00000001 }
+
+    $F7,$07,$01,$00,$00,$00,      { TEST    DWORD PTR [RDI],00000001    }
+    $F7,$07,$01,$00,$00,$00,      { TEST    DWORD PTR [RDI],00000001    }
+    $F7,$47,$01,$01,$00,$00,$00,  { TEST    DWORD PTR [RDI+01],00000001 }
+    $F7,$47,$03,$01,$00,$00,$00,  { TEST    DWORD PTR [RDI+03],00000001 }
+    $F7,$47,$FF,$01,$00,$00,$00,  { TEST    DWORD PTR [RDI-01],00000001 }
+    $F7,$47,$FD,$01,$00,$00,$00,  { TEST    DWORD PTR [RDI-03],00000001 }
+    $F7,$47,$04,$01,$00,$00,$00,  { TEST    DWORD PTR [RDI+04],00000001 }
+    $F7,$47,$04,$01,$00,$00,$00   { TEST    DWORD PTR [RDI+04],00000001 }
+  );
+
+
+procedure test1; assembler; nostackframe;
+asm
+  test [rdi+foo2], cval                   { test word ptr [rdi], 1   }
+  test byte ptr [rdi+foo], cval           { test byte ptr [rdi], 1   }
+  test [rdi+foo.w], cval                  { test word ptr [rdi+1], 1 }
+  test [rdi+foo.b2], cval                 { test byte ptr [rdi+3], 1 }
+  test [rdi-foo.w], cval                  { test word ptr [rdi-1], 1 }
+  test [rdi-foo.b2], cval                 { test byte ptr [rdi-3], 1 }
+  test [rdi+foo.b2+foo.w], cval           { test word ptr [rdi+4], 1 }
+  test [rdi+foo.w+foo.b2], cval           { test byte ptr [rdi+4], 1 }
+
+  test [rdi+foo2*1], cval                 { test word ptr [rdi], 1   }
+  test byte ptr [rdi+foo*1], cval         { test byte ptr [rdi], 1   }
+  test [rdi+foo.w*1], cval                { test word ptr [rdi+1], 1 }
+  test [rdi+foo.b2*1], cval               { test byte ptr [rdi+3], 1 }
+  test [rdi-foo.w*1], cval                { test word ptr [rdi-1], 1 }
+  test [rdi-foo.b2*1], cval               { test byte ptr [rdi-3], 1 }
+  test [rdi+foo.b2*1+foo.w*1], cval       { test word ptr [rdi+4], 1 }
+  test [rdi+foo.w*1+foo.b2*1], cval       { test byte ptr [rdi+4], 1 }
+
+  test [rdi+foo2*5], cval                 { test word ptr [rdi], 1    }
+  test byte ptr [rdi+foo*5], cval         { test byte ptr [rdi], 1    }
+  test [rdi+foo.w*5], cval                { test word ptr [rdi+5], 1  }
+  test [rdi+foo.b2*5], cval               { test byte ptr [rdi+15], 1 }
+  test [rdi-foo.w*5], cval                { test word ptr [rdi-5], 1  }
+  test [rdi-foo.b2*5], cval               { test byte ptr [rdi-15], 1 }
+  test [rdi+foo.b2*5+foo.w*3], cval       { test word ptr [rdi+18], 1 }
+  test [rdi+foo.w*5+foo.b2*3], cval       { test byte ptr [rdi+14], 1 }
+
+  test byte ptr [rdi+foo2], cval          { test byte ptr [rdi], 1   }
+  test byte ptr [rdi+foo], cval           { test byte ptr [rdi], 1   }
+  test byte ptr [rdi+foo.w], cval         { test byte ptr [rdi+1], 1 }
+  test byte ptr [rdi+foo.b2], cval        { test byte ptr [rdi+3], 1 }
+  test byte ptr [rdi-foo.w], cval         { test byte ptr [rdi-1], 1 }
+  test byte ptr [rdi-foo.b2], cval        { test byte ptr [rdi-3], 1 }
+  test byte ptr [rdi+foo.b2+foo.w], cval  { test byte ptr [rdi+4], 1 }
+  test byte ptr [rdi+foo.w+foo.b2], cval  { test byte ptr [rdi+4], 1 }
+  test byte ptr [rdi+foo32], cval         { test byte ptr [rdi], 1   }
+  test byte ptr [rdi+foo32_2.l], cval     { test byte ptr [rdi+1], 1 }
+
+  test word ptr [rdi+foo2], cval          { test word ptr [rdi], 1   }
+  test word ptr [rdi+foo], cval           { test word ptr [rdi], 1   }
+  test word ptr [rdi+foo.w], cval         { test word ptr [rdi+1], 1 }
+  test word ptr [rdi+foo.b2], cval        { test word ptr [rdi+3], 1 }
+  test word ptr [rdi-foo.w], cval         { test word ptr [rdi-1], 1 }
+  test word ptr [rdi-foo.b2], cval        { test word ptr [rdi-3], 1 }
+  test word ptr [rdi+foo.b2+foo.w], cval  { test word ptr [rdi+4], 1 }
+  test word ptr [rdi+foo.w+foo.b2], cval  { test word ptr [rdi+4], 1 }
+  test word ptr [rdi+foo32], cval         { test word ptr [rdi], 1   }
+  test word ptr [rdi+foo32_2.l], cval     { test word ptr [rdi+1], 1 }
+end;
+
+procedure test2; assembler; nostackframe;
+asm
+  test [rdi+foo32], cval                   { test dword ptr [rdi], 1   }
+  test [rdi+foo32_2.l], cval               { test dword ptr [rdi+1], 1 }
+
+  test dword ptr [rdi+foo2], cval          { test dword ptr [rdi], 1   }
+  test dword ptr [rdi+foo], cval           { test dword ptr [rdi], 1   }
+  test dword ptr [rdi+foo.w], cval         { test dword ptr [rdi+1], 1 }
+  test dword ptr [rdi+foo.b2], cval        { test dword ptr [rdi+3], 1 }
+  test dword ptr [rdi-foo.w], cval         { test dword ptr [rdi-1], 1 }
+  test dword ptr [rdi-foo.b2], cval        { test dword ptr [rdi-3], 1 }
+  test dword ptr [rdi+foo.b2+foo.w], cval  { test dword ptr [rdi+4], 1 }
+  test dword ptr [rdi+foo.w+foo.b2], cval  { test dword ptr [rdi+4], 1 }
+end;
+
+procedure Error;
+begin
+  Writeln('Error!');
+  Halt(1);
+end;
+
+function CompareCode(cp: CodePointer; dp: Pointer; sz: SizeInt): Boolean;
+begin
+  CompareCode := CompareByte(cp^, dp^, sz) = 0;
+end;
+
+begin
+  if not CompareCode(CodePointer(@test1), @expect1, SizeOf(expect1)) then
+    Error;
+  if not CompareCode(CodePointer(@test2), @expect2, SizeOf(expect2)) then
+    Error;
+
+  Writeln('Ok!');
+end.