Browse Source

AROS: RTL exec update. Memory sizes are IPTR

Memory sizes are expressed in IPTR/PtrUInt in order to be compatible to both
32 and 64-bit.

Affects both record structures and API call signatures.

See: https://github.com/aros-development-team/AROS/commit/d7df812342ac2bfc7df2fd271c4cab473fe804b3
magorium 3 years ago
parent
commit
e339d236e1
2 changed files with 9 additions and 9 deletions
  1. 3 3
      rtl/aros/i386/execd.inc
  2. 6 6
      rtl/aros/i386/execf.inc

+ 3 - 3
rtl/aros/i386/execd.inc

@@ -498,7 +498,7 @@ type  // Checked OK 05.08.2011 ALB
     mh_First     : PMemChunk;
     mh_Lower     : Pointer;
     mh_Upper     : Pointer;
-    mh_Free      : DWord;
+    mh_Free      : PtrUInt;
   end;
 
 type  // Checked OK 05.08.2011 ALB
@@ -509,7 +509,7 @@ type  // Checked OK 05.08.2011 ALB
       0 : (meu_Reqs: DWord);
       1 : (meu_Addr: Pointer)
     end;
-    me_Length: DWord;
+    me_Length: PtrUInt;
   end;
 
 type  // Checked OK 05.08.2011 ALB
@@ -547,7 +547,7 @@ const  // Checked OK 05.08.2011 ALB
 type  // Checked OK 05.08.2011 ALB
   PMemHandlerData = ^TMemHandlerData;
   TMemHandlerData = record
-    memh_RequestSize : DWord;
+    memh_RequestSize : PtrUInt;
     memh_RequestFlags: DWord;
     memh_Flags       : DWord;
   end;

+ 6 - 6
rtl/aros/i386/execf.inc

@@ -18,8 +18,8 @@ var
 
 procedure Forbid; syscall AOS_ExecBase 22;
 procedure Permit; syscall AOS_ExecBase 23;
-function execAllocMem(byteSize: Cardinal; requirements: Cardinal): Pointer; syscall LocalExecBase 33;
-procedure execFreeMem(memoryBlock: Pointer; byteSize: Cardinal); syscall LocalExecBase 35;
+function execAllocMem(byteSize: PtrUInt; requirements: Cardinal): Pointer; syscall LocalExecBase 33;
+procedure execFreeMem(memoryBlock: Pointer; byteSize: PtrUInt); syscall LocalExecBase 35;
 function FindTask(name: PChar): PTask; syscall LocalExecBase 49;
 function SetSignal(newSignals: Cardinal; signalSet : Cardinal): Cardinal; syscall LocalExecBase 51;
 function Wait(SignalSet: LongWord): LongWord; syscall AOS_ExecBase 53;
@@ -44,12 +44,12 @@ function AttemptSemaphore(SigSem: PSignalSemaphore): LongWord; syscall AOS_ExecB
 function CreateMsgPort: PMsgPort; syscall AOS_ExecBase 111;
 procedure DeleteMsgPort(Port: PMsgPort); syscall AOS_ExecBase 112;
 procedure ObtainSemaphoreShared(SigSem: PSignalSemaphore); syscall AOS_ExecBase 113;
-function AllocVec(ByteSize: DWord; Requirements: DWord): Pointer; syscall AOS_ExecBase 114;
+function AllocVec(ByteSize: PtrUInt; Requirements: DWord): Pointer; syscall AOS_ExecBase 114;
 procedure FreeVec(MemoryBlock: Pointer); syscall AOS_ExecBase 115;
-function CreatePool(requirements: Cardinal; puddleSize: Cardinal; threshSize: Cardinal): Pointer; syscall LocalExecBase 116;
+function CreatePool(requirements: Cardinal; puddleSize: PtrUInt; threshSize: PtrUInt): Pointer; syscall LocalExecBase 116;
 procedure DeletePool(poolHeader: Pointer); syscall LocalExecBase 117;
-function AllocPooled(poolHeader: Pointer; memSize: Cardinal): Pointer; syscall LocalExecBase 118;
-function FreePooled(poolHeader: Pointer; memory: Pointer; memSize: Cardinal): Pointer; syscall LocalExecBase 119;
+function AllocPooled(poolHeader: Pointer; memSize: PtrUInt): Pointer; syscall LocalExecBase 118;
+function FreePooled(poolHeader: Pointer; memory: Pointer; memSize: PtrUInt): Pointer; syscall LocalExecBase 119;
 procedure StackSwap(NewStack: PStackSwapStruct); syscall AOS_ExecBase 122;
 function NewStackSwap(NewStack: PStackSwapStruct; Function_: Pointer; Args: PStackSwapArgs): Pointer; syscall AOS_ExecBase 134;
 procedure RawPutChar(c: Char); syscall AOS_ExecBase 86;