diff options
| author | nickysn <nickysn@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2013-10-17 20:44:58 +0000 |
|---|---|---|
| committer | nickysn <nickysn@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2013-10-17 20:44:58 +0000 |
| commit | 1c52cc1f48762fdda6667f3b840bdd4a1ec37d61 (patch) | |
| tree | 776455cb17bf1975f6f80edb60c821314fc92ec2 /rtl | |
| parent | 7635a90d8be89e084d81333b4a924c012283fcf0 (diff) | |
| download | fpc-1c52cc1f48762fdda6667f3b840bdd4a1ec37d61.tar.gz | |
* the Ptr(sel,ofs) parameters changed from longint to word on i8086
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@25811 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'rtl')
| -rw-r--r-- | rtl/i8086/i8086.inc | 4 | ||||
| -rw-r--r-- | rtl/inc/systemh.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/rtl/i8086/i8086.inc b/rtl/i8086/i8086.inc index 542a55c7bc..026a5b010e 100644 --- a/rtl/i8086/i8086.inc +++ b/rtl/i8086/i8086.inc @@ -25,11 +25,11 @@ asm end; {$define FPC_SYSTEM_HAS_PTR} -function Ptr(sel,off: LongInt):farpointer;{$ifdef SYSTEMINLINE}inline;{$endif}assembler;nostackframe; +function Ptr(sel,off: Word):farpointer;{$ifdef SYSTEMINLINE}inline;{$endif}assembler;nostackframe; asm mov si, sp mov ax, ss:[si + 2 + extra_param_offset] // off - mov dx, ss:[si + 6 + extra_param_offset] // sel + mov dx, ss:[si + 4 + extra_param_offset] // sel end; {$define FPC_SYSTEM_HAS_CSEG} diff --git a/rtl/inc/systemh.inc b/rtl/inc/systemh.inc index 73abb6fad2..1102c2e7bf 100644 --- a/rtl/inc/systemh.inc +++ b/rtl/inc/systemh.inc @@ -1029,7 +1029,7 @@ function PopCnt(Const AValue : QWord): QWord;[internproc:fpc_in_popcnt_x]; Addr/Pointer Handling ****************************************************************************} -Function ptr(sel,off:Longint):farpointer;[internconst:fpc_in_const_ptr];{$ifdef SYSTEMINLINE}inline;{$endif} +Function ptr(sel,off:{$ifdef CPU16}Word{$else}Longint{$endif}):farpointer;[internconst:fpc_in_const_ptr];{$ifdef SYSTEMINLINE}inline;{$endif} Function Cseg:Word;{$ifdef SYSTEMINLINE}inline;{$endif} Function Dseg:Word;{$ifdef SYSTEMINLINE}inline;{$endif} Function Sseg:Word;{$ifdef SYSTEMINLINE}inline;{$endif} |