Browse Source

* replaced setintvec(x,@proc) in i8086 tests with the memory model independent version setintvec(x,ptr(seg(proc),ofs(proc)))

git-svn-id: trunk@32249 -
nickysn 9 years ago
parent
commit
8c81e93a96

+ 2 - 2
tests/test/cpu16/i8086/tfarcal2.pp

@@ -120,9 +120,9 @@ var
   g32: longint;
   g32: longint;
 begin
 begin
   GetIntVec(NearInt, OldNearIntVec);
   GetIntVec(NearInt, OldNearIntVec);
-  SetIntVec(NearInt, @IntNearHandler);
+  SetIntVec(NearInt, Ptr(Seg(IntNearHandler),Ofs(IntNearHandler)));
   GetIntVec(FarInt, OldFarIntVec);
   GetIntVec(FarInt, OldFarIntVec);
-  SetIntVec(FarInt, @IntFarHandler);
+  SetIntVec(FarInt, Ptr(Seg(IntFarHandler),Ofs(IntFarHandler)));
 
 
   asm
   asm
     int NearInt
     int NearInt

+ 2 - 2
tests/test/cpu16/i8086/tfarcal3.pp

@@ -96,9 +96,9 @@ label
   lbl;
   lbl;
 begin
 begin
   GetIntVec(NearInt, OldNearIntVec);
   GetIntVec(NearInt, OldNearIntVec);
-  SetIntVec(NearInt, @IntNearHandler);
+  SetIntVec(NearInt, Ptr(Seg(IntNearHandler),Ofs(IntNearHandler)));
   GetIntVec(FarInt, OldFarIntVec);
   GetIntVec(FarInt, OldFarIntVec);
-  SetIntVec(FarInt, @IntFarHandler);
+  SetIntVec(FarInt, Ptr(Seg(IntFarHandler),Ofs(IntFarHandler)));
 
 
   testproc2;
   testproc2;
   asm
   asm

+ 2 - 2
tests/test/cpu16/i8086/tfarcal4.pp

@@ -96,9 +96,9 @@ label
   lbl;
   lbl;
 begin
 begin
   GetIntVec(NearInt, OldNearIntVec);
   GetIntVec(NearInt, OldNearIntVec);
-  SetIntVec(NearInt, @IntNearHandler);
+  SetIntVec(NearInt, Ptr(Seg(IntNearHandler),Ofs(IntNearHandler)));
   GetIntVec(FarInt, OldFarIntVec);
   GetIntVec(FarInt, OldFarIntVec);
-  SetIntVec(FarInt, @IntFarHandler);
+  SetIntVec(FarInt, Ptr(Seg(IntFarHandler),Ofs(IntFarHandler)));
 
 
   testproc2;
   testproc2;
   asm
   asm

+ 2 - 2
tests/test/cpu16/i8086/tfarjmp2.pp

@@ -120,9 +120,9 @@ var
   g32: longint;
   g32: longint;
 begin
 begin
   GetIntVec(NearInt, OldNearIntVec);
   GetIntVec(NearInt, OldNearIntVec);
-  SetIntVec(NearInt, @IntNearHandler);
+  SetIntVec(NearInt, Ptr(Seg(IntNearHandler),Ofs(IntNearHandler)));
   GetIntVec(FarInt, OldFarIntVec);
   GetIntVec(FarInt, OldFarIntVec);
-  SetIntVec(FarInt, @IntFarHandler);
+  SetIntVec(FarInt, Ptr(Seg(IntFarHandler),Ofs(IntFarHandler)));
 
 
   asm
   asm
     int NearInt
     int NearInt

+ 1 - 1
tests/test/cpu16/i8086/tintr1.pp

@@ -47,7 +47,7 @@ begin
   Handled := False;
   Handled := False;
 
 
   GetIntVec(IntNo, OldHandler);
   GetIntVec(IntNo, OldHandler);
-  SetIntVec(IntNo, @OurHandler);
+  SetIntVec(IntNo, Ptr(Seg(OurHandler),Ofs(OurHandler)));
 
 
   Intr(IntNo, regs);
   Intr(IntNo, regs);
 
 

+ 1 - 1
tests/test/cpu16/i8086/tintr2.pp

@@ -71,7 +71,7 @@ begin
   Handled := False;
   Handled := False;
 
 
   GetIntVec(IntNo, OldHandler);
   GetIntVec(IntNo, OldHandler);
-  SetIntVec(IntNo, @OurHandler);
+  SetIntVec(IntNo, Ptr(Seg(OurHandler),Ofs(OurHandler)));
 
 
   Intr(IntNo, regs);
   Intr(IntNo, regs);
 
 

+ 2 - 2
tests/test/cpu16/i8086/tretf1.pp

@@ -156,9 +156,9 @@ end;
 
 
 begin
 begin
   GetIntVec(NearInt, OldNearIntVec);
   GetIntVec(NearInt, OldNearIntVec);
-  SetIntVec(NearInt, @IntNearHandler);
+  SetIntVec(NearInt, Ptr(Seg(IntNearHandler),Ofs(IntNearHandler)));
   GetIntVec(FarInt, OldFarIntVec);
   GetIntVec(FarInt, OldFarIntVec);
-  SetIntVec(FarInt, @IntFarHandler);
+  SetIntVec(FarInt, Ptr(Seg(IntFarHandler),Ofs(IntFarHandler)));
 
 
   TestAsm1;
   TestAsm1;
   TestAsm2;
   TestAsm2;

+ 2 - 2
tests/test/cpu16/i8086/tretf2.pp

@@ -156,9 +156,9 @@ end;
 
 
 begin
 begin
   GetIntVec(NearInt, OldNearIntVec);
   GetIntVec(NearInt, OldNearIntVec);
-  SetIntVec(NearInt, @IntNearHandler);
+  SetIntVec(NearInt, Ptr(Seg(IntNearHandler),Ofs(IntNearHandler)));
   GetIntVec(FarInt, OldFarIntVec);
   GetIntVec(FarInt, OldFarIntVec);
-  SetIntVec(FarInt, @IntFarHandler);
+  SetIntVec(FarInt, Ptr(Seg(IntFarHandler),Ofs(IntFarHandler)));
 
 
   TestAsm1;
   TestAsm1;
   TestAsm2;
   TestAsm2;