Przeglądaj źródła

* use the already existing TNative(U)IntNibbleIndex types for the TORDINALNIBBLEINDEX macro as this way memory models with far pointers (where Native(U)Int has a size of 4) is handled correctly as well

Sven Barth 3 lat temu
rodzic
commit
5412e463ff
1 zmienionych plików z 2 dodań i 18 usunięć
  1. 2 18
      packages/rtl-objpas/src/inc/syshelpers.pp

+ 2 - 18
packages/rtl-objpas/src/inc/syshelpers.pp

@@ -329,15 +329,7 @@ end;
 
 {$define TORDINALHELPER:=TNativeIntSysHelper}
 {$define TORDINALBITINDEX:=TNativeIntBitIndex}
-{$ifdef cpu16}
-  {$define TORDINALNIBBLEINDEX:=TSmallIntNibbleIndex}
-{$endif}
-{$ifdef cpu32}
-  {$define TORDINALNIBBLEINDEX:=TIntegerNibbleIndex}
-{$endif}
-{$ifdef cpu64}
-  {$define TORDINALNIBBLEINDEX:=TInt64NibbleIndex}
-{$endif}
+{$define TORDINALNIBBLEINDEX:=TNativeIntNibbleIndex}
 {$i syshelperso.inc}
 
 { ---------------------------------------------------------------------
@@ -346,15 +338,7 @@ end;
 
 {$define TORDINALHELPER:=TNativeUIntSysHelper}
 {$define TORDINALBITINDEX:=TNativeUIntBitIndex}
-{$ifdef cpu16}
-  {$define TORDINALNIBBLEINDEX:=TWordNibbleIndex}
-{$endif}
-{$ifdef cpu32}
-  {$define TORDINALNIBBLEINDEX:=TDwordNibbleIndex}
-{$endif}
-{$ifdef cpu64}
-  {$define TORDINALNIBBLEINDEX:=TQwordNibbleIndex}
-{$endif}
+{$define TORDINALNIBBLEINDEX:=TNativeUIntNibbleIndex}
 {$i syshelperso.inc}
 
 { ---------------------------------------------------------------------