paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-19 18:51:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

* i8086 compilation fixes

Browse Source 
git-svn-id: branches/i8086@24244 -
This commit is contained in:
nickysn 2013-04-14 16:34:02 +00:00
parent 3152df6e7f
commit fef3732884
2 changed files with 69 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
compiler/x86/aasmcpu.pas
View File

@ -181,11 +181,13 @@ interface
OT_UNITY = OT_IMMEDIATE or OT_ONENESS; { for shift/rotate instructions } OT_UNITY = OT_IMMEDIATE or OT_ONENESS; { for shift/rotate instructions }
{ Size of the instruction table converted by nasmconv.pas } { Size of the instruction table converted by nasmconv.pas }
{$ifdef x86_64} {$if defined(x86_64)}
instabentries = {$i x8664nop.inc} instabentries = {$i x8664nop.inc}
{$else x86_64} {$elseif defined(i386)}
instabentries = {$i i386nop.inc} instabentries = {$i i386nop.inc}
{$endif x86_64} {$elseif defined(i8086)}
instabentries = {$i i8086nop.inc}
{$endif}
maxinfolen = 8; maxinfolen = 8;
MaxInsChanges = 3; { Max things a instruction can change } MaxInsChanges = 3; { Max things a instruction can change }
@ -244,11 +246,13 @@ interface
InsProp : array[tasmop] of TInsProp = InsProp : array[tasmop] of TInsProp =
{$ifdef x86_64} {$if defined(x86_64)}
{$i x8664pro.inc} {$i x8664pro.inc}
{$else x86_64} {$elseif defined(i386)}
{$i i386prop.inc} {$i i386prop.inc}
{$endif x86_64} {$elseif defined(i8086)}
{$i i8086prop.inc}
{$endif}
type type
TOperandOrder = (op_intel,op_att); TOperandOrder = (op_intel,op_att);
@ -452,16 +456,18 @@ implementation
PInsTabMemRefSizeInfoCache=^TInsTabMemRefSizeInfoCache; PInsTabMemRefSizeInfoCache=^TInsTabMemRefSizeInfoCache;
const const
{$ifdef x86_64} {$if defined(x86_64)}
InsTab:array[0..instabentries-1] of TInsEntry={$i x8664tab.inc} InsTab:array[0..instabentries-1] of TInsEntry={$i x8664tab.inc}
{$else x86_64} {$elseif defined(i386)}
InsTab:array[0..instabentries-1] of TInsEntry={$i i386tab.inc} InsTab:array[0..instabentries-1] of TInsEntry={$i i386tab.inc}
{$endif x86_64} {$elseif defined(i8086)}
InsTab:array[0..instabentries-1] of TInsEntry={$i i8086tab.inc}
{$endif}
var var
InsTabCache : PInsTabCache; InsTabCache : PInsTabCache;
InsTabMemRefSizeInfoCache: PInsTabMemRefSizeInfoCache; InsTabMemRefSizeInfoCache: PInsTabMemRefSizeInfoCache;
const const
{$ifdef x86_64} {$if defined(x86_64)}
{ Intel style operands ! } { Intel style operands ! }
opsize_2_type:array[0..2,topsize] of longint=( opsize_2_type:array[0..2,topsize] of longint=(
(OT_NONE, (OT_NONE,
@ -499,7 +505,7 @@ implementation
reg_ot_table : array[tregisterindex] of longint = ( reg_ot_table : array[tregisterindex] of longint = (
{$i r8664ot.inc} {$i r8664ot.inc}
); );
{$else x86_64} {$elseif defined(i386)}
{ Intel style operands ! } { Intel style operands ! }
opsize_2_type:array[0..2,topsize] of longint=( opsize_2_type:array[0..2,topsize] of longint=(
(OT_NONE, (OT_NONE,
@ -537,7 +543,45 @@ implementation
reg_ot_table : array[tregisterindex] of longint = ( reg_ot_table : array[tregisterindex] of longint = (
{$i r386ot.inc} {$i r386ot.inc}
); );
{$endif x86_64} {$elseif defined(i8086)}
{ Intel style operands ! }
opsize_2_type:array[0..2,topsize] of longint=(
(OT_NONE,
OT_BITS8,OT_BITS16,OT_BITS32,OT_BITS64,OT_BITS16,OT_BITS32,OT_BITS32,
OT_BITS16,OT_BITS32,OT_BITS64,
OT_BITS32,OT_BITS64,OT_BITS80,OT_BITS64,OT_NONE,
OT_BITS64,
OT_NEAR,OT_FAR,OT_SHORT,
OT_NONE,
OT_BITS128,
OT_BITS256
),
(OT_NONE,
OT_BITS8,OT_BITS16,OT_BITS32,OT_BITS64,OT_BITS8,OT_BITS8,OT_BITS16,
OT_BITS16,OT_BITS32,OT_BITS64,
OT_BITS32,OT_BITS64,OT_BITS80,OT_BITS64,OT_NONE,
OT_BITS64,
OT_NEAR,OT_FAR,OT_SHORT,
OT_NONE,
OT_BITS128,
OT_BITS256
),
(OT_NONE,
OT_BITS8,OT_BITS16,OT_BITS32,OT_BITS64,OT_NONE,OT_NONE,OT_NONE,
OT_BITS16,OT_BITS32,OT_BITS64,
OT_BITS32,OT_BITS64,OT_BITS80,OT_BITS64,OT_NONE,
OT_BITS64,
OT_NEAR,OT_FAR,OT_SHORT,
OT_NONE,
OT_BITS128,
OT_BITS256
)
);
reg_ot_table : array[tregisterindex] of longint = (
{$i r8086ot.inc}
);
{$endif}
function MemRefInfo(aAsmop: TAsmOp): TInsTabMemRefSizeInfoRec; function MemRefInfo(aAsmop: TAsmOp): TInsTabMemRefSizeInfoRec;
begin begin
@ -1508,15 +1552,19 @@ implementation
function regval(r:Tregister):byte; function regval(r:Tregister):byte;
const const
{$ifdef x86_64} {$if defined(x86_64)}
opcode_table:array[tregisterindex] of tregisterindex = ( opcode_table:array[tregisterindex] of tregisterindex = (
{$i r8664op.inc} {$i r8664op.inc}
); );
{$else x86_64} {$elseif defined(i386)}
opcode_table:array[tregisterindex] of tregisterindex = ( opcode_table:array[tregisterindex] of tregisterindex = (
{$i r386op.inc} {$i r386op.inc}
); );
{$endif x86_64} {$elseif defined(i8086)}
opcode_table:array[tregisterindex] of tregisterindex = (
{$i r8086op.inc}
);
{$endif}
var var
regidx : tregisterindex; regidx : tregisterindex;
begin begin

6
compiler/x86/agx86nsm.pas
View File

@ -64,7 +64,13 @@ interface
nasm_regname_table : array[tregisterindex] of string[7] = ( nasm_regname_table : array[tregisterindex] of string[7] = (
{r386nasm.inc contains the Nasm name of each register.} {r386nasm.inc contains the Nasm name of each register.}
{$if defined(x86_64)}
{$fatal nasm support not yet implemented for x86_64 }
{$elseif defined(i386)}
{$i r386nasm.inc} {$i r386nasm.inc}
{$elseif defined(i8086)}
{$i r8086nasm.inc}
{$endif}
); );
function nasm_regname(r:Tregister):string; function nasm_regname(r:Tregister):string;