Quellcode durchsuchen

* i8086 far code memory model fixes in tests tw2739,tw3173,tw16034,tw1152,
tw2944 and tw9261

git-svn-id: trunk@25832 -

nickysn vor 11 Jahren
Ursprung
Commit
f3a686eb69

+ 1 - 1
tests/webtbs/tw1152.pp

@@ -10,7 +10,7 @@
 program exception;
 program exception;
 uses sysutils,crt;
 uses sysutils,crt;
 var
 var
-  saveexit : pointer;
+  saveexit : codepointer;
   finally_called : boolean;
   finally_called : boolean;
 
 
 procedure my_exit;
 procedure my_exit;

+ 6 - 1
tests/webtbs/tw16034.pp

@@ -9,6 +9,11 @@ program Hello;
 
 
 type
 type
   ptr = pointer;
   ptr = pointer;
+{$ifdef fpc}
+  codeptr = codepointer;
+{$else}
+  codeptr = pointer;
+{$endif}
   Int = ptrint;
   Int = ptrint;
   pPtr = ^ptr;
   pPtr = ^ptr;
   UInt = ptruint;
   UInt = ptruint;
@@ -109,7 +114,7 @@ var
 
 
   s0, s1, s2: UInt;
   s0, s1, s2: UInt;
   v0, v1, v2: ptr;
   v0, v1, v2: ptr;
-  cn0, cn1, cn2: ptr;
+  cn0, cn1, cn2: codeptr;
 
 
 begin
 begin
   // VMT Pointers
   // VMT Pointers

+ 1 - 1
tests/webtbs/tw2739.pp

@@ -26,7 +26,7 @@ end;
 
 
 function JclAddExceptNotifier(const NotifyMethod: TJclExceptNotifyMethod): Boolean; overload;
 function JclAddExceptNotifier(const NotifyMethod: TJclExceptNotifyMethod): Boolean; overload;
 var
 var
-  p : pointer;
+  p : codepointer;
 begin
 begin
   p:=@NotifyMethod;
   p:=@NotifyMethod;
 end;
 end;

+ 6 - 2
tests/webtbs/tw2944.pp

@@ -4,9 +4,13 @@
 
 
 {$ifdef fpc}{$mode Delphi}{$endif}
 {$ifdef fpc}{$mode Delphi}{$endif}
 type
 type
+{$ifndef fpc}
+  CodePointer = Pointer;
+  PCodePointer = PPointer;
+{$endif}
   WS2StubEntry = record
   WS2StubEntry = record
-    StubProc : Pointer;
-    ProcVar : PPointer;
+    StubProc : CodePointer;
+    ProcVar : PCodePointer;
     Name : PChar;
     Name : PChar;
   end;
   end;
   LPFN_WSACLEANUP = function : Integer; stdcall;
   LPFN_WSACLEANUP = function : Integer; stdcall;

+ 7 - 2
tests/webtbs/tw3173.pp

@@ -2,11 +2,16 @@
 { Submitted by "Dominik Zablotny" on  2004-06-18 }
 { Submitted by "Dominik Zablotny" on  2004-06-18 }
 { e-mail: [email protected] }
 { e-mail: [email protected] }
 program test;
 program test;
-{$ifdef fpc}{$mode delphi}{$endif}
+{$ifdef fpc}
+  {$mode delphi}
+{$else}
+type
+  codepointer = pointer;
+{$endif}
 var
 var
   p: procedure of object;
   p: procedure of object;
 
 
-  function f:pointer;
+  function f:codepointer;
   begin
   begin
   end;
   end;
 
 

+ 2 - 2
tests/webtbs/tw9261.pp

@@ -7,7 +7,7 @@ type methodprocvar = function(): Boolean of object;
 procedure test_procedure(a1, a2, a3, a4, a5, a6: integer; mv: methodprocvar);
 procedure test_procedure(a1, a2, a3, a4, a5, a6: integer; mv: methodprocvar);
 begin
 begin
   with Tmethod(mv) do
   with Tmethod(mv) do
-    if (code<>pointer($11111111)) or (data<>pointer($22222222)) then
+    if (code<>codepointer($11111111)) or (data<>pointer($22222222)) then
        begin
        begin
          writeln('test failed');
          writeln('test failed');
          halt(1);
          halt(1);
@@ -19,7 +19,7 @@ var a:methodprocvar;
 begin
 begin
   with Tmethod(a) do
   with Tmethod(a) do
     begin
     begin
-      code:=pointer($11111111);
+      code:=codepointer($11111111);
       data:=pointer($22222222);
       data:=pointer($22222222);
     end;
     end;
   test_procedure(1, 2, 3, 4, 5, 6, a);
   test_procedure(1, 2, 3, 4, 5, 6, a);