浏览代码

Revert "* 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"

This reverts commit 28006018ac45f76deb5dbc9dbcf5eda82a0d2acf.
marcoonthegit 1 年之前
父节点
当前提交
c98bd75dc0
共有 1 个文件被更改,包括 18 次插入2 次删除
  1. 18 2
      packages/rtl-objpas/src/inc/syshelpers.pp

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

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