From fbe7798f6a7c1371cf769b3deeec6428bb57cbc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A1roly=20Balogh?= <karoly@freepascal.org>
Date: Sat, 12 Aug 2017 21:39:54 +0000
Subject: [PATCH] palmunits: made it build with current compiler

git-svn-id: trunk@36890 -
---
 packages/palmunits/src/connectionmgr.pp   |  24 ++---
 packages/palmunits/src/filestream.pp      |  10 +-
 packages/palmunits/src/floatmgr.pp        | 106 +++++++++++-----------
 packages/palmunits/src/inetmgr.pp         |   4 +-
 packages/palmunits/src/intlmgr.pp         |   4 +-
 packages/palmunits/src/localemgr.pp       |   7 +-
 packages/palmunits/src/overlaymgr.pp      |  16 ++--
 packages/palmunits/src/serialmgr.pp       |  54 +++++------
 packages/palmunits/src/textmgr.pp         |  52 +++++------
 packages/palmunits/src/textservicesmgr.pp |   4 +-
 packages/palmunits/src/udamgr.pp          |   6 +-
 packages/palmunits/src/vfsmgr.pp          |  82 ++++++++---------
 12 files changed, 185 insertions(+), 184 deletions(-)

diff --git a/packages/palmunits/src/connectionmgr.pp b/packages/palmunits/src/connectionmgr.pp
index 6cbac398c1..6a94b7863d 100644
--- a/packages/palmunits/src/connectionmgr.pp
+++ b/packages/palmunits/src/connectionmgr.pp
@@ -475,7 +475,7 @@ function __CncProfileCloseDB: Err; syscall sysTrapCncMgrDispatch;
 function CncProfileSettingGet(profileId: CncProfileID; paramId: UInt16; paramBufferP: Pointer; var ioParamSizeP: UInt16): Err;
 begin
  asm
-  move.l #$sysTrapCncMgrProfileSettingGet, D2
+  move.l #sysTrapCncMgrProfileSettingGet, D2
  end;
  CncProfileSettingGet := __CncProfileSettingGet(profileId, paramId, paramBufferP, ioParamSizeP);
 end;
@@ -483,7 +483,7 @@ end;
 function CncProfileSettingSet(iProfileId: CncProfileID; paramId: UInt16; const paramBufferP: Pointer; paramSize: UInt16): Err;
 begin
  asm
-  move.l #$sysTrapCncMgrProfileSettingSet, D2
+  move.l #sysTrapCncMgrProfileSettingSet, D2
  end;
  CncProfileSettingSet := __CncProfileSettingSet(iProfileId, paramId, paramBufferP, paramSize);
 end;
@@ -491,7 +491,7 @@ end;
 function CncProfileSetCurrent(profileId: CncProfileID): Err;
 begin
  asm
-  move.l #$sysTrapCncMgrProfileSetCurrent, D2
+  move.l #sysTrapCncMgrProfileSetCurrent, D2
  end;
  CncProfileSetCurrent := __CncProfileSetCurrent(profileId);
 end;
@@ -499,7 +499,7 @@ end;
 function CncProfileGetCurrent(var profileIdP: CncProfileID): Err;
 begin
  asm
-  move.l #$sysTrapCncMgrProfileGetCurrent, D2;
+  move.l #sysTrapCncMgrProfileGetCurrent, D2;
  end;
  CncProfileGetCurrent := __CncProfileGetCurrent(profileIdP);
 end;
@@ -507,7 +507,7 @@ end;
 function CncProfileGetIDFromName(const profileNameP: PChar; var profileIdP: CncProfileID): Err;
 begin
  asm
-  move.l #$sysTrapCncMgrProfileGetIDFromName, D2;
+  move.l #sysTrapCncMgrProfileGetIDFromName, D2;
  end;
  CncProfileGetIDFromName := __CncProfileGetIDFromName(profileNameP, profileIdP);
 end;
@@ -515,7 +515,7 @@ end;
 function CncProfileCreate(var profileIdP: CncProfileID): Err;
 begin
  asm
-  move.l #$sysTrapCncMgrProfileCreate, D2;
+  move.l #sysTrapCncMgrProfileCreate, D2;
  end;
  CncProfileCreate := __CncProfileCreate(profileIdP);
 end;
@@ -523,7 +523,7 @@ end;
 function CncProfileDelete(profileId: CncProfileID): Err;
 begin
  asm
-  move.l #$sysTrapCncMgrProfileDelete, D2;
+  move.l #sysTrapCncMgrProfileDelete, D2;
  end;
  CncProfileDelete := __CncProfileDelete(profileId);
 end;
@@ -531,7 +531,7 @@ end;
 function CncProfileGetIDFromIndex(index: UInt16; var profileIdP: CncProfileID): Err;
 begin
  asm
-  move.l #$sysTrapCncMgrProfileGetIDFromIndex, D2;
+  move.l #sysTrapCncMgrProfileGetIDFromIndex, D2;
  end;
  CncProfileGetIDFromIndex := __CncProfileGetIDFromIndex(index, profileIdP);
 end;
@@ -539,7 +539,7 @@ end;
 function CncProfileGetIndex(profileId: CncProfileID; var indexP: UInt16): Err;
 begin
  asm
-  move.l #$sysTrapCncMgrProfileGetIndex, D2;
+  move.l #sysTrapCncMgrProfileGetIndex, D2;
  end;
  CncProfileGetIndex := __CncProfileGetIndex(profileID, indexP);
 end;
@@ -547,7 +547,7 @@ end;
 function CncProfileCount(var profilesCountP: UInt16): Err;
 begin
  asm
-  move.l #$sysTrapCncMgrProfileCount, D2
+  move.l #sysTrapCncMgrProfileCount, D2
  end;
  CncProfileCount := __CncProfileCount(profilesCountP);
 end;
@@ -555,7 +555,7 @@ end;
 function CncProfileOpenDB: Err;
 begin
  asm
-  move.l #$sysTrapCncMgrProfileOpenDB, D2;
+  move.l #sysTrapCncMgrProfileOpenDB, D2;
  end;
  CncProfileOpenDB := __CncProfileOpenDB;
 end;
@@ -563,7 +563,7 @@ end;
 function CncProfileCloseDB: Err;
 begin
  asm
-  move.l #$sysTrapCncMgrProfileCloseDB, D2;
+  move.l #sysTrapCncMgrProfileCloseDB, D2;
  end;
  CnCProfileCloseDB := __CncProfileCloseDB;
 end;
diff --git a/packages/palmunits/src/filestream.pp b/packages/palmunits/src/filestream.pp
index 91622d804a..addacd3d5d 100644
--- a/packages/palmunits/src/filestream.pp
+++ b/packages/palmunits/src/filestream.pp
@@ -322,27 +322,27 @@ end;
 
 function FileEOF(stream: FileHand): Boolean;
 begin
-  FileEOF := FileControl(fileOpGetEOFStatus, stream, nil, Longint(nil)) = fileErrEOF;
+  FileEOF := FileControl(fileOpGetEOFStatus, stream, nil, nil) = fileErrEOF;
 end;
 
 function FileError(stream: FileHand): Err;
 begin
-  FileError := FileControl(fileOpGetIOErrorStatus, stream, nil, Longint(nil));
+  FileError := FileControl(fileOpGetIOErrorStatus, stream, nil, nil);
 end;
 
 function FileClearerr(stream: FileHand): Err;
 begin
-  FileClearerr := FileControl(fileOpClearError, stream, nil, Longint(nil));
+  FileClearerr := FileControl(fileOpClearError, stream, nil, nil);
 end;
 
 function FileGetLastError(stream: FileHand): Err;
 begin
-  FileGetLastError := FileControl(fileOpGetLastError, stream, nil, Longint(nil));
+  FileGetLastError := FileControl(fileOpGetLastError, stream, nil, nil);
 end;
 
 function FileFlush(stream: FileHand): Err;
 begin
-  FileFlush := FileControl(fileOpFlush, stream, nil, Longint(nil));
+  FileFlush := FileControl(fileOpFlush, stream, nil, nil);
 end;
 
 end.
diff --git a/packages/palmunits/src/floatmgr.pp b/packages/palmunits/src/floatmgr.pp
index 2099567e4a..bb46a9238b 100644
--- a/packages/palmunits/src/floatmgr.pp
+++ b/packages/palmunits/src/floatmgr.pp
@@ -504,7 +504,7 @@ function ___d_dtoi(Value: FlpDouble): Int32; syscall sysTrapFlpEmDispatch;
 function FlpBase10Info(a: FlpDouble; var mantissaP: UInt32; var exponentP, signP: Int16): Err;
 begin
  asm
-  move.l #$sysFloatBase10Info, D2;
+  move.l #sysFloatBase10Info, D2;
  end;
  FlpBase10Info := __FlpBase10Info(a, mantissaP, exponentP, signP);
 end;
@@ -512,7 +512,7 @@ end;
 function FlpFToA(a: FlpDouble; s: PChar): Err;
 begin
  asm
-  move.l #$sysFloatFToA, D2;
+  move.l #sysFloatFToA, D2;
  end;
  FlpFToA := __FlpFToA(a, s);
 end;
@@ -520,7 +520,7 @@ end;
 function FlpAToF(const s: PChar): FlpDouble;
 begin
  asm
-  move.l #$sysFloatAToF, D2
+  move.l #sysFloatAToF, D2
  end;
  FlpAToF := __FlpAToF(s);
 end;
@@ -528,7 +528,7 @@ end;
 function FlpCorrectedAdd(firstOperand, secondOperand: FlpDouble; howAccurate: Int16): FlpDouble;
 begin
  asm
-  move.l #$sysFloatCorrectedAdd, D2
+  move.l #sysFloatCorrectedAdd, D2
  end;
  FlpCorrectedAdd := __FlpCorrectedAdd(firstOperand, secondOperand, howAccurate);
 end;
@@ -536,7 +536,7 @@ end;
 function FlpCorrectedSub(firstOperand, secondOperand: FlpDouble;  howAccurate: Int16): FlpDouble;
 begin
  asm
-  move.l #$sysFloatCorrectedSub, D2;
+  move.l #sysFloatCorrectedSub, D2;
  end;
  FlpCorrectedSub := __FlpCorrectedSub(firstOperand, secondOperand, howAccurate);
 end;
@@ -544,7 +544,7 @@ end;
 procedure FlpBufferAToF(var result: FlpDouble; const s: PChar);
 begin
  asm
-  move.l #$sysFloatAToF, D2;
+  move.l #sysFloatAToF, D2;
  end;
  __FlpBufferAToF(result, s);
 end;
@@ -552,7 +552,7 @@ end;
 procedure FlpBufferCorrectedAdd(var result: FlpDouble; firstOperand, secondOperand: FlpDouble; howAccurate: Int16);
 begin
  asm
-  move.l #$sysFloatCorrectedAdd, D2;
+  move.l #sysFloatCorrectedAdd, D2;
  end;
  __FlpBufferCorrectedAdd(result, firstOperand, secondOperand, howAccurate);
 end;
@@ -560,7 +560,7 @@ end;
 procedure FlpBufferCorrectedSub(var result: FlpDouble; firstOperand, secondOperand: FlpDouble; howAccurate: Int16);
 begin
  asm
-  move.l #$sysFloatCorrectedSub, D2
+  move.l #sysFloatCorrectedSub, D2
  end;
  __FlpBufferCorrectedSub(result, firstOperand, secondOperand, howAccurate);
 end;
@@ -568,7 +568,7 @@ end;
 function FlpVersion: UInt32;
 begin
  asm
-  move.l #$sysFloatVersion, D2;
+  move.l #sysFloatVersion, D2;
  end;
  FlpVersion := __FlpVersion;
 end;
@@ -576,7 +576,7 @@ end;
 function _fp_round(Value: Int32): Int32;
 begin
  asm
-  move.l #$sysFloatEm_fp_round, D2;
+  move.l #sysFloatEm_fp_round, D2;
  end;
  _fp_round := ___fp_round(Value);
 end;
@@ -584,7 +584,7 @@ end;
 function _fp_get_fpscr: Int32;
 begin
  asm
-  move.l #$sysFloatEm_fp_get_fpscr, D2;
+  move.l #sysFloatEm_fp_get_fpscr, D2;
  end;
  _fp_get_fpscr := ___fp_get_fpscr;
 end;
@@ -592,7 +592,7 @@ end;
 procedure _fp_set_fpscr(Value: Int32);
 begin
  asm
-  move.l #$sysFloatEm_fp_set_fpscr, D2;
+  move.l #sysFloatEm_fp_set_fpscr, D2;
  end;
  ___fp_set_fpscr(Value);
 end;
@@ -600,7 +600,7 @@ end;
 function _f_utof(Value: UInt32): FlpFloat;
 begin
  asm
-  move.l #$sysFloatEm_f_utof, D2;
+  move.l #sysFloatEm_f_utof, D2;
  end;
  _f_utof := ___f_utof(Value);
 end;
@@ -608,7 +608,7 @@ end;
 function _f_itof(Value: Int32): FlpFloat;
 begin
  asm
-  move.l #$sysFloatEm_f_itof, D2;
+  move.l #sysFloatEm_f_itof, D2;
  end;
  _f_itof := ___f_itof(Value);
 end;
@@ -616,7 +616,7 @@ end;
 function _d_utod(Value: UInt32): FlpDouble;
 begin
  asm
-  move.l #$sysFloatEm_d_utod, D2;
+  move.l #sysFloatEm_d_utod, D2;
  end;
  _d_utod := ___d_utod(Value);
 end;
@@ -624,7 +624,7 @@ end;
 function _d_itod(Value: Int32): FlpDouble;
 begin
  asm
-  move.l #$sysFloatEm_d_itod, D2;
+  move.l #sysFloatEm_d_itod, D2;
  end;
  _d_itod := ___d_itod(Value);
 end;
@@ -632,7 +632,7 @@ end;
 function _f_ftod(Value: FlpFloat): FlpDouble;
 begin
  asm
-  move.l #$sysFloatEm_f_ftod, D2;
+  move.l #sysFloatEm_f_ftod, D2;
  end;
  _f_ftod := ___f_ftod(Value);
 end;
@@ -640,7 +640,7 @@ end;
 function _d_dtof(Value: FlpDouble): FlpFloat;
 begin
  asm
-  move.l #$sysFloatEm_d_dtof, D2;
+  move.l #sysFloatEm_d_dtof, D2;
  end;
  _d_dtof := ___d_dtof(Value);
 end;
@@ -648,7 +648,7 @@ end;
 function _f_qtof(var Value: FlpLongDouble): FlpFloat;
 begin
  asm
-  move.l #$sysFloatEm_f_qtof, D2;
+  move.l #sysFloatEm_f_qtof, D2;
  end;
  _f_qtof := ___f_qtof(Value);
 end;
@@ -656,7 +656,7 @@ end;
 function _f_ftou(Value: FlpFloat): UInt32;
 begin
  asm
-  move.l #$sysFloatEm_f_ftou, D2;
+  move.l #sysFloatEm_f_ftou, D2;
  end;
  _f_ftou := ___f_ftou(Value);
 end;
@@ -664,7 +664,7 @@ end;
 function _f_ftoi(Value: FlpFloat): Int32;
 begin
  asm
-  move.l #$sysFloatEm_f_ftoi, D2;
+  move.l #sysFloatEm_f_ftoi, D2;
  end;
  _f_ftoi := ___f_ftoi(Value);
 end;
@@ -672,7 +672,7 @@ end;
 function _d_dtou(Value: FlpDouble): UInt32;
 begin
  asm
-  move.l #$sysFloatEm_d_dtou, D2;
+  move.l #sysFloatEm_d_dtou, D2;
  end;
  _d_dtou := ___d_dtou(Value);
 end;
@@ -680,7 +680,7 @@ end;
 function _d_dtoi(Value: FlpDouble): Int32;
 begin
  asm
-  move.l #$sysFloatEm_d_dtoi, D2;
+  move.l #sysFloatEm_d_dtoi, D2;
  end;
  _d_dtoi := ___d_dtoi(Value);
 end;
@@ -723,126 +723,126 @@ function ___d_div(Left: FlpDouble; Right: FlpDouble): FlpDouble; syscall sysTrap
 function _f_cmp(Left: FlpFloat; Right: FlpFloat): Int32;
 begin
  asm
-  move.l #$sysFloatEm_f_cmp , D2
+  move.l #sysFloatEm_f_cmp , D2
  end;
  _f_cmp := ___f_cmp(Left, Right);
 end;
 function _f_cmpe(Left: FlpFloat; Right: FlpFloat): Int32;
 begin
  asm
-  move.l #$sysFloatEm_f_cmpe , D2
+  move.l #sysFloatEm_f_cmpe , D2
  end;
  _f_cmpe := ___f_cmpe(Left, Right);
 end;
 function _f_feq(Left: FlpFloat; Right: FlpFloat): Int32;
 begin
  asm
-  move.l #$sysFloatEm_f_feq , D2
+  move.l #sysFloatEm_f_feq , D2
  end;
  _f_feq := ___f_feq(Left, Right);
 end;
 function _f_fne(Left: FlpFloat; Right: FlpFloat): Int32;
 begin
  asm
-  move.l #$sysFloatEm_f_fne , D2
+  move.l #sysFloatEm_f_fne , D2
  end;
  _f_fne := ___f_fne(Left, Right);
 end;
 function _f_flt(Left: FlpFloat; Right: FlpFloat): Int32;
 begin
  asm
-  move.l #$sysFloatEm_f_flt, D2;
+  move.l #sysFloatEm_f_flt, D2;
  end;
  _f_flt := ___f_flt(Left, Right);
 end;
 function _f_fle(Left: FlpFloat; Right: FlpFloat): Int32;
 begin
  asm
-  move.l #$sysFloatEm_f_fle, D2;
+  move.l #sysFloatEm_f_fle, D2;
  end;
  _f_fle := ___f_fle(Left, Right);
 end;
 function _f_fgt(Left: FlpFloat; Right: FlpFloat): Int32;
 begin
  asm
-  move.l #$sysFloatEm_f_fgt, D2;
+  move.l #sysFloatEm_f_fgt, D2;
  end;
  _f_fgt := ___f_fgt(Left, Right);
 end;
 function _f_fge(Left: FlpFloat; Right: FlpFloat): Int32;
 begin
  asm
-  move.l #$sysFloatEm_f_fge, D2;
+  move.l #sysFloatEm_f_fge, D2;
  end;
  _f_fge := ___f_fge(Left, Right);
 end;
 function _f_fun(Left: FlpFloat; Right: FlpFloat): Int32;
 begin
  asm
-  move.l #$sysFloatEm_f_fun, D2;
+  move.l #sysFloatEm_f_fun, D2;
  end;
  _f_fun := ___f_fun(Left, Right);
 end;
 function _f_for(Left: FlpFloat; Right: FlpFloat): Int32;
 begin
  asm
-  move.l #$sysFloatEm_f_for, D2
+  move.l #sysFloatEm_f_for, D2
  end;
  _f_for := ___f_for(Left, Right);
 end;
 function _d_cmp(Left: FlpDouble; Right: FlpDouble): Int32;
 begin
  asm
-  move.l #$sysFloatEm_d_cmp, D2
+  move.l #sysFloatEm_d_cmp, D2
  end;
  _d_cmp := ___d_cmp(Left, Right);
 end;
 function _d_cmpe(Left: FlpDouble; Right: FlpDouble): Int32;
 begin
  asm
-  move.l #$sysFloatEm_d_cmpe, D2;
+  move.l #sysFloatEm_d_cmpe, D2;
  end;
  _d_cmpe := ___d_cmpe(Left, Right);
 end;
 function _d_feq(Left: FlpDouble; Right: FlpDouble): Int32;
 begin
  asm
-  move.l #$sysFloatEm_d_feq, D2;
+  move.l #sysFloatEm_d_feq, D2;
  end;
  _d_feq := ___d_feq(Left, Right);
 end;
 function _d_fne(Left: FlpDouble; Right: FlpDouble): Int32;
 begin
  asm
-  move.l #$sysFloatEm_d_fne, D2;
+  move.l #sysFloatEm_d_fne, D2;
  end;
  _d_fne := ___d_fne(Left, Right);
 end;
 function _d_flt(Left: FlpDouble; Right: FlpDouble): Int32;
 begin
  asm
-  move.l #$sysFloatEm_d_flt, D2;
+  move.l #sysFloatEm_d_flt, D2;
  end;
  _d_flt := ___d_flt(Left, Right);
 end;
 function _d_fle(Left: FlpDouble; Right: FlpDouble): Int32;
 begin
  asm
-  move.l #$sysFloatEm_d_fle, D2
+  move.l #sysFloatEm_d_fle, D2
  end;
  _d_fle := ___d_fle(Left, Right);
 end;
 function _d_fgt(Left: FlpDouble; Right: FlpDouble): Int32;
 begin
  asm
-  move.l #$sysFloatEm_d_fgt, D2;
+  move.l #sysFloatEm_d_fgt, D2;
  end;
  _d_fgt := ___d_fgt(Left, Right);
 end;
 function _d_fge(Left: FlpDouble; Right: FlpDouble): Int32;
 begin
  asm
-  move.l #$sysFloatEm_d_fge, D2;
+  move.l #sysFloatEm_d_fge, D2;
  end;
  _d_fge := ___d_fge(Left, Right);
 end;
@@ -850,7 +850,7 @@ end;
 function _d_fun(Left: FlpDouble; Right: FlpDouble): Int32;
 begin
  asm
-  move.l #$sysFloatEm_d_fun, D2
+  move.l #sysFloatEm_d_fun, D2
  end;
  _d_fun := ___d_fun(Left, Right);
 end;
@@ -858,49 +858,49 @@ end;
 function _d_for(Left: FlpDouble; Right: FlpDouble): Int32;
 begin
  asm
-  move.l #$sysFloatEm_d_for, D2
+  move.l #sysFloatEm_d_for, D2
  end;
  _d_for := ___d_for(Left, Right);
 end;
 function _f_neg(Value: FlpFloat): FlpFloat;
 begin
  asm
-  move.l #$sysFloatEm_f_neg, D2;
+  move.l #sysFloatEm_f_neg, D2;
  end;
  _f_neg := ___f_neg(Value);
 end;
 function _f_add(Left: FlpFloat; Right: FlpFloat): FlpFloat;
 begin
  asm
-  move.l #$sysFloatEm_f_add, D2;
+  move.l #sysFloatEm_f_add, D2;
  end;
  _f_add := ___f_add(Left, Right);
 end;
 function _f_mul(Left: FlpFloat; Right: FlpFloat): FlpFloat;
 begin
  asm
-  move.l #$sysFloatEm_f_mul, D2;
+  move.l #sysFloatEm_f_mul, D2;
  end;
  _f_mul := ___f_mul(Left, Right);
 end;
 function _f_sub(Left: FlpFloat; Right: FlpFloat): FlpFloat;
 begin
  asm
-  move.l #$sysFloatEm_f_sub, D2;
+  move.l #sysFloatEm_f_sub, D2;
  end;
  _f_sub := ___f_sub(Left, Right);
 end;
 function _f_div(Left: FlpFloat; Right: FlpFloat): FlpFloat;
 begin
  asm
-  move.l #$sysFloatEm_f_div, D2
+  move.l #sysFloatEm_f_div, D2
  end;
  _f_div := ___f_div(Left, Right);
 end;
 function _d_neg(Value: FlpDouble): FlpDouble;
 begin
  asm
-  move.l #$sysFloatEm_d_neg, D2;
+  move.l #sysFloatEm_d_neg, D2;
  end;
  _d_neg := ___d_neg(Value);
 end;
@@ -908,7 +908,7 @@ end;
 function _d_add(Left: FlpDouble; Right: FlpDouble): FlpDouble;
 begin
  asm
-  move.l #$sysFloatEm_d_add, D2;
+  move.l #sysFloatEm_d_add, D2;
  end;
  _d_add := ___d_add(Left, Right);
 end;
@@ -916,7 +916,7 @@ end;
 function _d_mul(Left: FlpDouble; Right: FlpDouble): FlpDouble;
 begin
  asm
-  move.l #$sysFloatEm_d_mul, D2;
+  move.l #sysFloatEm_d_mul, D2;
  end;
  _d_mul := ___d_mul(Left, Right);
 end;
@@ -924,7 +924,7 @@ end;
 function _d_sub(Left: FlpDouble; Right: FlpDouble): FlpDouble;
 begin
  asm
-  move.l #$sysFloatEm_d_sub, D2;
+  move.l #sysFloatEm_d_sub, D2;
  end;
  _d_sub := ___d_sub(Left, Right);
 end;
@@ -932,7 +932,7 @@ end;
 function _d_div(Left: FlpDouble; Right: FlpDouble): FlpDouble;
 begin
  asm
-  move.l #$sysFloatEm_d_div, D2;
+  move.l #sysFloatEm_d_div, D2;
  end;
  _d_div := ___d_div(Left, Right);
 end;
diff --git a/packages/palmunits/src/inetmgr.pp b/packages/palmunits/src/inetmgr.pp
index 3a5f7f69d1..10440c8f56 100644
--- a/packages/palmunits/src/inetmgr.pp
+++ b/packages/palmunits/src/inetmgr.pp
@@ -630,7 +630,7 @@ const
   inetLastEvent             = firstINetLibEvent + 1;
 
 type
-  generic = record
+  iNetEventGeneric = record
     datum: array [0..7] of UInt16;
   end;
 
@@ -655,7 +655,7 @@ type
     screenX: Int16;
     screenY: Int16;
     case Integer of
-      0: (generic: generic);
+      0: (inetGeneric: inetEventGeneric);
       1: (inetSockReady: inetSockReady);
       2: (inetSockStatusChange: inetSockStatusChange);
   end;
diff --git a/packages/palmunits/src/intlmgr.pp b/packages/palmunits/src/intlmgr.pp
index 5f85fc141b..af9042de17 100644
--- a/packages/palmunits/src/intlmgr.pp
+++ b/packages/palmunits/src/intlmgr.pp
@@ -117,7 +117,7 @@ function __IntlSetRoutineAddress(iSelector: IntlSelector; iProcPtr: Pointer): Er
 function IntlGetRoutineAddress(inSelector: IntlSelector): Pointer;
 begin
  asm
-  move.l #$intlIntlGetRoutineAddress, D2;
+  move.l #intlIntlGetRoutineAddress, D2;
  end;
  IntlGetRoutineAddress := __IntlGetRoutineAddress(inSelector);
 end;
@@ -125,7 +125,7 @@ end;
 function IntlSetRoutineAddress(iSelector: IntlSelector; iProcPtr: Pointer): Err;
 begin
  asm
-  move.l #$intlIntlSetRoutineAddress, D2;
+  move.l #intlIntlSetRoutineAddress, D2;
  end;
  IntlSetRoutineAddress := __IntlSetRoutineAddress(iSelector, iProcPtr);
 end;
diff --git a/packages/palmunits/src/localemgr.pp b/packages/palmunits/src/localemgr.pp
index cc2fceb937..cfc6bd778e 100644
--- a/packages/palmunits/src/localemgr.pp
+++ b/packages/palmunits/src/localemgr.pp
@@ -209,10 +209,11 @@ function __LmLocaleToIndex(var iLocale: LmLocaleType; var oLocaleIndex: UInt16):
 function __LmGetLocaleSetting(iLocaleIndex: UInt16; iChoice: LmLocaleSettingChoice;
                               oValue: Pointer; iValueSize: UInt16): Err;  syscall sysTrapLmDispatch;
 
+{$WARNING d2 register is trashed!}
 function LmGetNumLocales: UInt16; // syscall sysTrapLmDispatch, lmGetNumLocales_;
 begin
  asm
-  move.l #$lmGetNumLocales_, d2;
+  move.l #lmGetNumLocales_, d2
  end;
  LmGetNumLocales := __LmGetNumLocales;
 end;
@@ -220,7 +221,7 @@ end;
 function LmLocaleToIndex({const} var iLocale: LmLocaleType; var oLocaleIndex: UInt16): Err; // syscall sysTrapLmDispatch, lmLocaleToIndex_;
 begin
  asm
-  MOVE.L #$lmLocaleToIndex_, d2;
+  move.l #lmLocaleToIndex_, d2
  end;
  LmLocaleToIndex := __LmLocaleToIndex(iLocale, oLocaleIndex);
 end;
@@ -229,7 +230,7 @@ function LmGetLocaleSetting(iLocaleIndex: UInt16; iChoice: LmLocaleSettingChoice
                             oValue: Pointer; iValueSize: UInt16): Err; // syscall sysTrapLmDispatch, lmGetLocaleSetting_;
 begin
  asm
-  MOVE.L #$lmGetLocaleSetting_, d2;
+  move.l #lmGetLocaleSetting_, d2
  end;
  LmGetLocaleSetting := __LmGetLocaleSetting(iLocaleIndex, iChoice, oValue, iValueSize);
 end;
diff --git a/packages/palmunits/src/overlaymgr.pp b/packages/palmunits/src/overlaymgr.pp
index 0cd1ed0de4..875356db65 100644
--- a/packages/palmunits/src/overlaymgr.pp
+++ b/packages/palmunits/src/overlaymgr.pp
@@ -205,7 +205,7 @@ function OmLocaleToOverlayDBName(const baseDBName: PChar; var targetLocale: LmLo
                                  overlayDBName: PChar): Err;
 begin
  asm
-  move.l #$omLocaleToOverlayDBName_,D2;
+  move.l #omLocaleToOverlayDBName_,D2;
  end;
  OmLocaleToOverlayDBName := __OmLocaleToOverlayDBName(baseDBName, targetLocale, overlayDBName);
 end;
@@ -213,7 +213,7 @@ end;
 function OmOverlayDBNameToLocale(const overlayDBName: PChar; var overlayLocale: LmLocaleType): Err;
 begin
  asm
-  move.l #$omOverlayDBNameToLocale_,D2;
+  move.l #omOverlayDBNameToLocale_,D2;
  end;
  OmOverlayDBNameToLocale := __OmOverlayDBNameToLocale(overlayDBName, overlayLocale);
 end;
@@ -221,7 +221,7 @@ end;
 procedure OmGetCurrentLocale(var currentLocale: LmLocaleType);
 begin
  asm
-  move.l #$omGetCurrentLocale_,D2;
+  move.l #omGetCurrentLocale_,D2;
  end;
  __OmGetCurrentLocale(currentLocale);
 end;
@@ -229,7 +229,7 @@ end;
 function OmGetIndexedLocale(localeIndex: UInt16; var theLocale: LmLocaleType): Err;
 begin
  asm
-  move.l #$omGetIndexedLocale_,D2;
+  move.l #omGetIndexedLocale_,D2;
  end;
  OmGetIndexedLocale := __OmGetIndexedLocale(localeIndex, theLocale);
 end;
@@ -237,7 +237,7 @@ end;
 procedure OmGetSystemLocale(var systemLocale: LmLocaleType);
 begin
  asm
-  move.l #$omGetSystemLocale_,D2;
+  move.l #omGetSystemLocale_,D2;
  end;
  __OmGetSystemLocale(systemLocale);
 end;
@@ -245,7 +245,7 @@ end;
 function OmSetSystemLocale(var systemLocale: LmLocaleType): Err;
 begin
  asm
-  move.l #$omSetSystemLocale_,D2;
+  move.l #omSetSystemLocale_,D2;
  end;
  OmSetSystemLocale := __OmSetSystemLocale(systemLocale);
 end;
@@ -253,7 +253,7 @@ end;
 function OmGetRoutineAddress(inSelector: OmSelector): Pointer;
 begin
  asm
-  move.l #$omGetRoutineAddress_,D2;
+  move.l #omGetRoutineAddress_,D2;
  end;
  OmGetRoutineAddress := __OmGetRoutineAddress(inSelector);
 end;
@@ -261,7 +261,7 @@ end;
 function OmGetNextSystemLocale(iNewSearch: Boolean; var ioStateInfoP: OmSearchStateType; var oLocaleP: LmLocaleType): Err;
 begin
  asm
-  move.l #$omGetNextSystemLocale_,D2;
+  move.l #omGetNextSystemLocale_,D2;
  end;
  OmGetNextSystemLocale := __OmGetNextSystemLocale(iNewSearch, ioStateInfoP, oLocaleP);
 end;
diff --git a/packages/palmunits/src/serialmgr.pp b/packages/palmunits/src/serialmgr.pp
index 4556f5acd1..7e41f98cf8 100644
--- a/packages/palmunits/src/serialmgr.pp
+++ b/packages/palmunits/src/serialmgr.pp
@@ -343,7 +343,7 @@ function __SrmPrimeWakeupHandler(portId: UInt16; minBytes: UInt16): Err; syscall
 function SerialMgrInstall: Err;
 begin
  asm
-  move.l #$sysSerialInstall,D2;
+  move.l #sysSerialInstall,D2;
  end;
  SerialMgrInstall := __SerialMgrInstall;
 end;
@@ -351,7 +351,7 @@ end;
 function SrmOpen(port, baud: UInt32; var newPortIdP: UInt16): Err;
 begin
  asm
-  move.l #$sysSerialOpen,D2;
+  move.l #sysSerialOpen,D2;
  end;
  SrmOpen := __SrmOpen(port, baud, newPortIdP);
 end;
@@ -359,7 +359,7 @@ end;
 function SrmExtOpen(port: UInt32; var configP: SrmOpenConfigType; configSize: UInt16; var newPortIdP: UInt16): Err;
 begin
  asm
-  move.l #$sysSerialOpenV4,D2;
+  move.l #sysSerialOpenV4,D2;
  end;
  SrmExtOpen := __SrmExtOpen(port, configP, configSize, newPortIdP);
 end;
@@ -367,14 +367,14 @@ end;
 function SrmExtOpenBackground(port: UInt32; var configP: SrmOpenConfigType; configSize: UInt16; var newPortIdP: UInt16): Err;
 begin
  asm
-  move.l #$sysSerialOpenBkgndV4,D2;
+  move.l #sysSerialOpenBkgndV4,D2;
  end;
  SrmExtOpenBackground := __SrmExtOpenBackground(port, configP, configSize, newPortIdP);
 end;
 function SrmOpenBackground(port, baud: UInt32; var newPortIdP: UInt16): Err;
 begin
  asm
-  move.l #$sysSerialOpenBkgnd,D2;
+  move.l #sysSerialOpenBkgnd,D2;
  end;
  SrmOpenBackground := __SrmOpenBackground(port, baud, newPortIdP);
 end;
@@ -382,7 +382,7 @@ end;
 function SrmClose(portId: UInt16): Err;
 begin
  asm
-  move.l #$sysSerialClose,D2;
+  move.l #sysSerialClose,D2;
  end;
  SrmClose := __SrmClose(portId);
 end;
@@ -390,7 +390,7 @@ end;
 function SrmSleep: Err;
 begin
  asm
-  move.l #$sysSerialSleep,D2;
+  move.l #sysSerialSleep,D2;
  end;
  SrmSleep := __SrmSleep;
 end;
@@ -398,7 +398,7 @@ end;
 function SrmWake: Err;
 begin
  asm
-  move.l #$sysSerialWake,D2;
+  move.l #sysSerialWake,D2;
  end;
  SrmWake := __SrmWake;
 end;
@@ -406,7 +406,7 @@ end;
 function SrmGetDeviceCount(var numOfDevicesP: UInt16): Err;
 begin
  asm
-  move.l #$sysSerialGetDeviceCount,D2;
+  move.l #sysSerialGetDeviceCount,D2;
  end;
  SrmGetDeviceCount := __SrmGetDeviceCount(numOfDevicesP);
 end;
@@ -414,7 +414,7 @@ end;
 function SrmGetDeviceInfo(deviceID: UInt32; var deviceInfoP: DeviceInfoType): Err;
 begin
  asm
-  move.l #$sysSerialGetDeviceInfo,D2;
+  move.l #sysSerialGetDeviceInfo,D2;
  end;
  SrmGetDeviceInfo := __SrmGetDeviceInfo(deviceID, deviceInfoP);
 end;
@@ -422,7 +422,7 @@ end;
 function SrmGetStatus(portId: UInt16; var statusFieldP: UInt32; var lineErrsP: UInt16): Err;
 begin
  asm
-  move.l #$sysSerialGetStatus,D2;
+  move.l #sysSerialGetStatus,D2;
  end;
  SrmGetStatus := __SrmGetStatus(portId, statusFieldP, lineErrsP);
 end;
@@ -430,7 +430,7 @@ end;
 function SrmClearErr(portId: UInt16): Err;
 begin
  asm
-  move.l #$sysSerialClearErr,D2;
+  move.l #sysSerialClearErr,D2;
  end;
  SrmClearErr := __SrmClearErr(portId);
 end;
@@ -438,7 +438,7 @@ end;
 function SrmControl(portId, op: UInt16; valueP: Pointer; var valueLenP: UInt16): Err;
 begin
  asm
-  move.l #$sysSerialControl,D2;
+  move.l #sysSerialControl,D2;
  end;
  SrmControl := __SrmControl(portId, op, valueP, valueLenP);
 end;
@@ -446,7 +446,7 @@ end;
 function SrmCustomControl(portId, opCode: UInt16; creator: UInt32; valueP: Pointer; var valueLenP: UInt16): Err;
 begin
  asm
-  move.l #$sysSerialCustomControl,D2;
+  move.l #sysSerialCustomControl,D2;
  end;
  SrmCustomControl := __SrmCustomControl(portId, opCode, creator, valueP, valueLenP);
 end;
@@ -454,7 +454,7 @@ end;
 function SrmSend(portId: UInt16; const bufP: Pointer; count: UInt32; var errP: Err): UInt32;
 begin
  asm
-  move.l #$sysSerialSend,D2;
+  move.l #sysSerialSend,D2;
  end;
  SrmSend := __SrmSend(portId, bufP, count, errP);
 end;
@@ -462,7 +462,7 @@ end;
 function SrmSendWait(portId: UInt16): Err;
 begin
  asm
-  move.l #$sysSerialSendWait,D2;
+  move.l #sysSerialSendWait,D2;
  end;
  SrmSendwait := __SrmSendwait(portId);
 end;
@@ -470,7 +470,7 @@ end;
 function SrmSendCheck(portId: UInt16; var numBytesP: UInt32): Err;
 begin
  asm
-  move.l #$sysSerialSendCheck,D2;
+  move.l #sysSerialSendCheck,D2;
  end;
  SrmSendCheck := __SrmSendCheck(portId, numBytesP);
 end;
@@ -478,7 +478,7 @@ end;
 function SrmSendFlush(portId: UInt16): Err;
 begin
  asm
-  move.l #$sysSerialSendFlush,D2;
+  move.l #sysSerialSendFlush,D2;
  end;
  SrmSendFlush := __SrmSendFlush(portId);
 end;
@@ -486,7 +486,7 @@ end;
 function SrmReceive(portId: UInt16; rcvBufP: Pointer; count: UInt32; timeout: Int32; var errP: Err): UInt32;
 begin
  asm
-  move.l #$sysSerialReceive,D2;
+  move.l #sysSerialReceive,D2;
  end;
  SrmReceive := __SrmReceive(portId, rcvBufP, count, timeout, errP);
 end;
@@ -494,7 +494,7 @@ end;
 function SrmReceiveWait(portId: UInt16; bytes: UInt32; timeout: Int32): Err;
 begin
  asm
-  move.l #$sysSerialReceiveWait,D2;
+  move.l #sysSerialReceiveWait,D2;
  end;
  SrmReceiveWait := __SrmReceiveWait(portId, bytes, timeout);
 end;
@@ -502,7 +502,7 @@ end;
 function SrmReceiveCheck(portId: UInt16; var numBytesP: UInt32): Err;
 begin
  asm
-  move.l #$sysSerialReceiveCheck,D2;
+  move.l #sysSerialReceiveCheck,D2;
  end;
  SrmReceiveCheck := __SrmReceiveCheck(portId, numBytesP);
 end;
@@ -510,7 +510,7 @@ end;
 function SrmReceiveFlush(portId: UInt16; timeout: Int32): Err;
 begin
  asm
-  move.l #$sysSerialReceiveFlush,D2;
+  move.l #sysSerialReceiveFlush,D2;
  end;
  SrmReceiveFlush := __SrmReceiveFlush(portId, timeout);
 end;
@@ -518,7 +518,7 @@ end;
 function SrmSetReceiveBuffer(portId: UInt16; bufP: Pointer; bufSize: UInt16): Err;
 begin
  asm
-  move.l #$sysSerialSetRcvBuffer,D2;
+  move.l #sysSerialSetRcvBuffer,D2;
  end;
  SrmSetReceiveBuffer := __SrmSetReceiveBuffer(portId, bufP, bufSize);
 end;
@@ -526,7 +526,7 @@ end;
 function SrmReceiveWindowOpen(portId: UInt16; var bufPP: UInt8Ptr; var sizeP: UInt32): Err;
 begin
  asm
-  move.l #$sysSerialRcvWindowOpen,D2;
+  move.l #sysSerialRcvWindowOpen,D2;
  end;
  SrmReceiveWindowOpen := __SrmReceiveWindowOpen(portId, bufPP, sizeP);
 end;
@@ -534,7 +534,7 @@ end;
 function SrmReceiveWindowClose(portId: UInt16; bytesPulled: UInt32): Err;
 begin
  asm
-  move.l #$sysSerialRcvWindowClose,D2;
+  move.l #sysSerialRcvWindowClose,D2;
  end;
  SrmReceiveWindowClose := __SrmReceiveWindowClose(portId, bytesPulled);
 end;
@@ -542,7 +542,7 @@ end;
 function SrmSetWakeupHandler(portId: UInt16; procP: WakeupHandlerProcPtr; refCon: UInt32): Err;
 begin
  asm
-  move.l #$sysSerialSetWakeupHandler,D2;
+  move.l #sysSerialSetWakeupHandler,D2;
  end;
  SrmSetWakeupHandler := __SrmSetWakeupHandler(portId, procP, refcon);
 end;
@@ -550,7 +550,7 @@ end;
 function SrmPrimeWakeupHandler(portId: UInt16; minBytes: UInt16): Err;
 begin
  asm
-  move.l #$sysSerialPrimeWakeupHandler,D2;
+  move.l #sysSerialPrimeWakeupHandler,D2;
  end;
  SrmPrimeWakeupHandler := __SrmPrimeWakeupHandler(portId, minBytes);
 end;
diff --git a/packages/palmunits/src/textmgr.pp b/packages/palmunits/src/textmgr.pp
index 47b21ef9fd..04e1b7b794 100644
--- a/packages/palmunits/src/textmgr.pp
+++ b/packages/palmunits/src/textmgr.pp
@@ -423,7 +423,7 @@ function __TxtCompare(const s1: PChar; s1Len: UInt16; var s1MatchLen: UInt16;
 function TxtByteAttr(inByte: UInt8): UInt8;
 begin
  asm
-  move.l #$intlTxtByteAttr, D2;
+  move.l #intlTxtByteAttr, D2;
  end;
  TxtByteAttr := TxtByteAttr(inByte);
 end;
@@ -431,7 +431,7 @@ end;
 function TxtCharAttr(inChar: WChar): UInt16;
 begin
  asm
-  move.l #$intlTxtCharAttr, D2;
+  move.l #intlTxtCharAttr, D2;
  end;
  TxtCharAttr := __TxtCharAttr(inChar);
 end;
@@ -439,7 +439,7 @@ end;
 function TxtCharXAttr(inChar: WChar): UInt16;
 begin
  asm
-  move.l #$intlTxtCharXAttr, D2;
+  move.l #intlTxtCharXAttr, D2;
  end;
  TxtCharXAttr := __TxtCharXAttr(inChar);
 end;
@@ -447,7 +447,7 @@ end;
 function TxtCharSize(inChar: WChar): UInt16;
 begin
  asm
-  move.l #$intlTxtCharSize, D2;
+  move.l #intlTxtCharSize, D2;
  end;
  TxtCharSize := TxtCharSize(inChar);
 end;
@@ -455,7 +455,7 @@ end;
 function TxtCharWidth(inChar: WChar): Int16;
 begin
  asm
-  move.l #$intlTxtCharWidth, D2;
+  move.l #intlTxtCharWidth, D2;
  end;
  TxtCharWidth := TxtCharWidth(inChar);
 end;
@@ -463,7 +463,7 @@ end;
 function TxtGetPreviousChar(const inText: PChar; inOffset: UInt32; outChar: WCharPtr): UInt16;
 begin
  asm
-  move.l #$intlTxtGetPreviousChar, D2;
+  move.l #intlTxtGetPreviousChar, D2;
  end;
  TxtGetPreviousChar := __TxtGetPreviousChar(inText, inOffset, outChar);
 end;
@@ -471,7 +471,7 @@ end;
 function TxtGetNextChar(const inText: PChar; inOffset: UInt32; outChar: WCharPtr): UInt16;
 begin
  asm
-  move.l #$intlTxtGetNextChar, D2;
+  move.l #intlTxtGetNextChar, D2;
  end;
  TxtGetNextChar := __TxtGetNextChar(inText, inOffset, outChar);
 end;
@@ -479,7 +479,7 @@ end;
 function TxtGetChar(const inText: PChar; inOffset: UInt32): WChar;
 begin
  asm
-  move.l #$intlTxtGetChar, D2;
+  move.l #intlTxtGetChar, D2;
  end;
  TxtGetChar := __TxtGetChar(inText, inOffset);
 end;
@@ -487,7 +487,7 @@ end;
 function TxtSetNextChar(ioText: PChar; inOffset: UInt32; inChar: WChar): UInt16;
 begin
  asm
-  move.l #$intlTxtSetNextChar, D2;
+  move.l #intlTxtSetNextChar, D2;
  end;
  TxtSetNextChar := __TxtSetNextChar(ioText, inOffset, inChar);
 end;
@@ -495,7 +495,7 @@ end;
 function TxtReplaceStr(ioStr: PChar; inMaxLen: UInt16; const inParamStr: PChar; inParamNum: UInt16): UInt16;
 begin
  asm
-  move.l #$intlTxtReplaceStr, D2;
+  move.l #intlTxtReplaceStr, D2;
  end;
  TxtReplaceStr := __TxtReplaceStr(ioStr, inMaxLen, inParamStr, inParamNum);
 end;
@@ -503,7 +503,7 @@ end;
 function TxtParamString(const inTemplate, param0, param1, param2, param3: PChar): PChar;
 begin
  asm
-  move.l #$intlTxtParamString, D2;
+  move.l #intlTxtParamString, D2;
  end;
  TxtParamString := __TxtParamString(inTemplate, param0, param1, param2, param3);
 end;
@@ -511,7 +511,7 @@ end;
 function TxtCharBounds(const inText: PChar; inOffset: UInt32; var outStart: UInt32; var outEnd: UInt32): WChar;
 begin
  asm
-  move.l #$intlTxtCharBounds, D2;
+  move.l #intlTxtCharBounds, D2;
  end;
  TxtCharBounds := TxtCharBounds(inText, inOffset, outStart, outEnd);
 end;
@@ -519,7 +519,7 @@ end;
 function TxtGetTruncationOffset(const inText: PChar; inOffset: UInt32): UInt32;
 begin
  asm
-  move.l #$intlTxtGetTruncationOffset, D2;
+  move.l #intlTxtGetTruncationOffset, D2;
  end;
  TxtGetTruncationOffset := __TxtGetTruncationOffset(inText, inOffset);
 end;
@@ -528,7 +528,7 @@ function TxtFindString(const inSourceStr, inTargetStr: PChar;
                        var outPos: UInt32; var outLength: UInt16): Boolean;
 begin
  asm
-  move.l #$intlTxtFindString, D2;
+  move.l #intlTxtFindString, D2;
  end;
  TxtFindString := TxtFindString(inSourceStr, inTargetStr, outPos, outLength);
 end;
@@ -537,7 +537,7 @@ function TxtWordBounds(const inText: PChar; inLength, inOffset: UInt32;
                        var outStart, outEnd: UInt32): Boolean;
 begin
  asm
-  move.l #$intlTxtWordBounds, D2;
+  move.l #intlTxtWordBounds, D2;
  end;
  TxtWordBounds := __TxtWordBounds(inText, inLength, inOffset, outStart, outEnd);
 end;
@@ -545,7 +545,7 @@ end;
 function TxtGetWordWrapOffset(const iTextP: PChar; iOffset: UInt32): UInt32;
 begin
  asm
-  move.l #$intlTxtGetWordWrapOffset, D2;
+  move.l #intlTxtGetWordWrapOffset, D2;
  end;
  TxtGetWordWrapOffset := __TxtGetWordWrapOffset(iTextP, iOffset);
 end;
@@ -553,7 +553,7 @@ end;
 function TxtCharEncoding(inChar: WChar): CharEncodingType;
 begin
  asm
-  move.l #$intlTxtCharEncoding, D2;
+  move.l #intlTxtCharEncoding, D2;
  end;
  TxtCharEncoding := __TxtCharEncoding(inChar);
 end;
@@ -561,7 +561,7 @@ end;
 function TxtStrEncoding(const inStr: PChar): CharEncodingType;
 begin
  asm
-  move.l #$intlTxtStrEncoding, D2;
+  move.l #intlTxtStrEncoding, D2;
  end;
  TxtStrEncoding := __TxtStrEncoding(inStr);
 end;
@@ -569,7 +569,7 @@ end;
 function TxtMaxEncoding(a, b: CharEncodingType): CharEncodingType;
 begin
  asm
-  move.l #$intlTxtMaxEncoding, D2;
+  move.l #intlTxtMaxEncoding, D2;
  end;
  TxtMaxEncoding := __TxtMaxEncoding(a, b);
 end;
@@ -577,7 +577,7 @@ end;
 function TxtEncodingName(inEncoding: CharEncodingType): PChar;
 begin
  asm
-  move.l #$intlTxtEncodingName, D2;
+  move.l #intlTxtEncodingName, D2;
  end;
  TxtEncodingName := __TxtEncodingName(inEncoding);
 end;
@@ -585,7 +585,7 @@ end;
 function TxtNameToEncoding(const iEncodingName: PChar): CharEncodingType;
 begin
  asm
-  move.l #$intlTxtNameToEncoding, D2;
+  move.l #intlTxtNameToEncoding, D2;
  end;
  TxtNameToEncoding := __TxtNameToEncoding(iEncodingName);
 end;
@@ -594,7 +594,7 @@ function TxtTransliterate(const inSrcText: PChar; inSrcLength: UInt16; outDstTex
                           var ioDstLength: UInt16; inOp: TranslitOpType): Err;
 begin
  asm
-  move.l #$intlTxtTransliterate, D2;
+  move.l #intlTxtTransliterate, D2;
  end;
  TxtTransliterate := __TxtTransliterate(inSrcText, inSrcLength, outDstText, ioDstLength, inOp);
 end;
@@ -605,7 +605,7 @@ function TxtConvertEncoding(newConversion: Boolean; var ioStateP: TxtConvertStat
          const substitutionStr: PChar; substitutionLen: UInt16): Err;
 begin
  asm
-  move.l #$intlTxtConvertEncoding, D2;
+  move.l #intlTxtConvertEncoding, D2;
  end;
  TxtConvertEncoding := __TxtConvertEncoding(newConversion, ioStateP, srcTextP, ioSrcBytes,
                                             srcEncoding, dstTextP, ioDstBytes, dstEncoding,
@@ -615,7 +615,7 @@ end;
 function TxtCharIsValid(inChar: WChar): Boolean;
 begin
  asm
-  move.l #$intlTxtCharIsValid, D2;
+  move.l #intlTxtCharIsValid, D2;
  end;
  TxtCharIsValid := __TxtCharIsValid(inChar);
 end;
@@ -624,7 +624,7 @@ function TxtCaselessCompare(const s1: PChar; s1Len: UInt16; var s1MatchLen: UInt
                             const s2: PChar; s2Len: UInt16; var s2MatchLen: UInt16): Int16;
 begin
  asm
-  move.l #$intlTxtCaselessCompare, D2;
+  move.l #intlTxtCaselessCompare, D2;
  end;
  TxtCaselessCompare := __TxtCaselessCompare(s1, s1Len, s1MatchLen, s2, s2Len, s2MatchLen);
 end;
@@ -633,7 +633,7 @@ function TxtCompare(const s1: PChar; s1Len: UInt16; var s1MatchLen: UInt16;
                     const s2: PChar; s2Len: UInt16; var s2MatchLen: UInt16): Int16;
 begin
  asm
-  move.l #$intlTxtCompare, D2;
+  move.l #intlTxtCompare, D2;
  end;
  TxtCompare := __TxtCompare(s1, s1Len, s1MatchLen, s2, s2Len, s2MatchLen);
 end;
diff --git a/packages/palmunits/src/textservicesmgr.pp b/packages/palmunits/src/textservicesmgr.pp
index 61d6677db7..181aa8ed85 100644
--- a/packages/palmunits/src/textservicesmgr.pp
+++ b/packages/palmunits/src/textservicesmgr.pp
@@ -102,7 +102,7 @@ function __TsmSetFepMode(nullParam: Pointer; inNewMode: TsmFepModeType): TsmFepM
 function TsmGetFepMode(nullParam: Pointer): TsmFepModeType;
 begin
  asm
-  move.l #$tsmGetFepMode_, D2;
+  move.l #tsmGetFepMode_, D2;
  end;
  TsmGetFepMode := __TsmGetFepMode(nullParam);
 end;
@@ -110,7 +110,7 @@ end;
 function TsmSetFepMode(nullParam: Pointer; inNewMode: TsmFepModeType): TsmFepModeType;
 begin
  asm
-  move.l #$tsmSetFepMode_, D2;
+  move.l #tsmSetFepMode_, D2;
  end;
  TsmSetFepMode := __TsmSetFepMode(nullParam, inNewMode);
 end;
diff --git a/packages/palmunits/src/udamgr.pp b/packages/palmunits/src/udamgr.pp
index aa0b4b2030..739be6d141 100644
--- a/packages/palmunits/src/udamgr.pp
+++ b/packages/palmunits/src/udamgr.pp
@@ -173,7 +173,7 @@ function __UDAMemoryReaderNew(var bufferP: UInt8; bufferSizeInBytes: UDABufferSi
 function UDAExchangeReaderNew(var socket: ExgSocketType): UDAReaderPtr;
 begin
  asm
-  move.l #$sysUdaExchangeReaderNew, D2;
+  move.l #sysUdaExchangeReaderNew, D2;
  end;
  UDAExchangeReaderNew := __UDAExchangeReaderNew(socket);
 end;
@@ -181,7 +181,7 @@ end;
 function UDAExchangeWriterNew(var socket: ExgSocketType; bufferSize: UDABufferSize): UDAWriterPtr;
 begin
  asm
-  move.l #$sysUdaExchangeWriterNew, D2;
+  move.l #sysUdaExchangeWriterNew, D2;
  end;
  UDAExchangeWriterNew := __UDAExchangeWriterNew(socket, bufferSize);
 end;
@@ -189,7 +189,7 @@ end;
 function UDAMemoryReaderNew(var bufferP: UInt8; bufferSizeInBytes: UDABufferSize): UDAReaderPtr;
 begin
  asm
-  move.l #$sysUdaMemoryReaderNew, D2;
+  move.l #sysUdaMemoryReaderNew, D2;
  end;
  UDAMemoryReaderNew := __UDAMemoryReaderNew(bufferP, bufferSizeInBytes);
 end;
diff --git a/packages/palmunits/src/vfsmgr.pp b/packages/palmunits/src/vfsmgr.pp
index cf1224a74b..f3cd096900 100644
--- a/packages/palmunits/src/vfsmgr.pp
+++ b/packages/palmunits/src/vfsmgr.pp
@@ -469,7 +469,7 @@ function __VFSFileDBGetRecord(ref: FileRef; recIndex: UInt16; var recHP: MemHand
 function VFSInit: Err;
 begin
  asm
-  move.l #$vfsTrapInit, D2;
+  move.l #vfsTrapInit, D2;
  end;
  VFSInit := __VFSInit;
 end;
@@ -478,7 +478,7 @@ function VFSCustomControl(fsCreator, apiCreator: UInt32; apiSelector: UInt16;
                           valueP: Pointer; var valueLenP: UInt16): Err;
 begin
  asm
-  move.l #$vfsTrapCustomControl, D2;
+  move.l #vfsTrapCustomControl, D2;
  end;
  VFSCustomControl := __VFSCustomControl(fsCreator, apiCreator, apiSelector, valueP, valueLenP);
 end;
@@ -486,7 +486,7 @@ end;
 function VFSFileCreate(volRefNum: UInt16; const pathNameP: PChar): Err;
 begin
  asm
-  move.l #$vfsTrapFileCreate, D2;
+  move.l #vfsTrapFileCreate, D2;
  end;
  VFSFileCreate := __VFSFileCreate(volRefNum, pathNameP);
 end;
@@ -494,7 +494,7 @@ end;
 function VFSFileOpen(volRefNum: UInt16; const pathNameP: PChar; openMode: UInt16; var fileRefP: FileRef): Err;
 begin
  asm
-  move.l #$vfsTrapFileOpen, D2;
+  move.l #vfsTrapFileOpen, D2;
  end;
  VFSFileOpen := __VFSFileOpen(volRefNum, pathNameP, openMode, fileRefP);
 end;
@@ -502,7 +502,7 @@ end;
 function VFSFileClose(fileRef: FileRef): Err;
 begin
  asm
-  move.l #$vfsTrapFileClose, D2;
+  move.l #vfsTrapFileClose, D2;
  end;
  VFSFileClose := __VFSFileClose(fileRef);
 end;
@@ -511,7 +511,7 @@ function VFSFileReadData(fileRef: FileRef; numBytes: UInt32; bufBaseP: Pointer;
                          offset: UInt32; var numBytesReadP: UInt32): Err;
 begin
  asm
-  move.l #$vfsTrapFileReadData, D2;
+  move.l #vfsTrapFileReadData, D2;
  end;
  VFSFileReadData := __VFSFileReadData(fileRef, numBytes, bufBaseP, offset, numBytesReadP);
 end;
@@ -519,7 +519,7 @@ end;
 function VFSFileRead(fileRef: FileRef; numBytes: UInt32; bufP: Pointer; var numBytesReadP: UInt32): Err;
 begin
  asm
-  move.l #$vfsTrapFileRead, D2;
+  move.l #vfsTrapFileRead, D2;
  end;
  VFSFileRead := __VFSFileRead(fileRef, numBytes, bufP, numBytesReadP);
 end;
@@ -527,7 +527,7 @@ end;
 function VFSFileWrite(fileRef: FileRef; numBytes: UInt32; const dataP: Pointer; var numBytesWrittenP: UInt32): Err;
 begin
  asm
-  move.l #$vfsTrapFileWrite, D2;
+  move.l #vfsTrapFileWrite, D2;
  end;
  VFSFileWrite := __VFSFileWrite(fileRef, numBytes, dataP, numBytesWrittenP);
 end;
@@ -535,7 +535,7 @@ end;
 function VFSFileDelete(volRefNum: UInt16; const pathNameP: PChar): Err;
 begin
  asm
-  move.l #$vfsTrapFileDelete, D2;
+  move.l #vfsTrapFileDelete, D2;
  end;
  VFSFileDelete := __VFSFileDelete(volRefNum, pathNameP);
 end;
@@ -543,7 +543,7 @@ end;
 function VFSFileRename(volRefNum: UInt16; const pathNameP, newNameP: PChar): Err;
 begin
  asm
-  move.l #$vfsTrapFileRename, D2;
+  move.l #vfsTrapFileRename, D2;
  end;
  VFSFileRename := __VFSFileRename(volRefNum, pathNameP, newNameP);
 end;
@@ -551,7 +551,7 @@ end;
 function VFSFileSeek(fileRef: FileRef; origin: FileOrigin; offset: Int32): Err;
 begin
  asm
-  move.l #$vfsTrapFileSeek, D2;
+  move.l #vfsTrapFileSeek, D2;
  end;
  VFSFileSeek := __VFSFileSeek(fileRef, origin, offset);
 end;
@@ -559,7 +559,7 @@ end;
 function VFSFileEOF(fileRef: FileRef): Err;
 begin
  asm
-  move.l #$vfsTrapFileEOF, D2;
+  move.l #vfsTrapFileEOF, D2;
  end;
  VFSFileEOF := __VFSFileEOF(fileRef);
 end;
@@ -567,7 +567,7 @@ end;
 function VFSFileTell(fileRef: FileRef; var filePosP: UInt32): Err;
 begin
  asm
-  move.l #$vfsTrapFileTell, D2;
+  move.l #vfsTrapFileTell, D2;
  end;
  VFSFileTell := __VFSFileTell(fileRef, filePosP);
 end;
@@ -575,7 +575,7 @@ end;
 function VFSFileSize(fileRef: FileRef; var fileSizeP: UInt32): Err;
 begin
  asm
-  move.l #$vfsTrapFileSize, D2;
+  move.l #vfsTrapFileSize, D2;
  end;
  VFSFileSize := __VFSFileSize(fileRef, fileSizeP);
 end;
@@ -583,7 +583,7 @@ end;
 function VFSFileResize(fileRef: FileRef; newSize: UInt32): Err;
 begin
  asm
-  move.l #$vfsTrapFileResize, D2;
+  move.l #vfsTrapFileResize, D2;
  end;
  VFSFileResize := __VFSFileResize(fileRef, newSize);
 end;
@@ -591,7 +591,7 @@ end;
 function VFSFileGetAttributes(fileRef: FileRef; var attributesP: UInt32): Err;
 begin
  asm
-  move.l #$vfsTrapFileGetAttributes, D2;
+  move.l #vfsTrapFileGetAttributes, D2;
  end;
  VFSFileGetAttributes := __VFSFileGetAttributes(fileRef, attributesP);
 end;
@@ -599,7 +599,7 @@ end;
 function VFSFileSetAttributes(fileRef: FileRef; attributes: UInt32): Err;
 begin
  asm
-  move.l #$vfsTrapFileSetAttributes, D2;
+  move.l #vfsTrapFileSetAttributes, D2;
  end;
  VFSFileSetAttributes := __VFSFileSetAttributes(fileRef, attributes);
 end;
@@ -607,7 +607,7 @@ end;
 function VFSFileGetDate(fileRef: FileRef; whichDate: UInt16; var dateP: UInt32): Err;
 begin
  asm
-  move.l #$vfsTrapFileGetDate, D2;
+  move.l #vfsTrapFileGetDate, D2;
  end;
  VFSFileGetDate := __VFSFileGetDate(fileRef, whichDate, dateP);
 end;
@@ -615,7 +615,7 @@ end;
 function VFSFileSetDate(fileRef: FileRef; whichDate: UInt16; date: UInt32): Err;
 begin
  asm
-  move.l #$vfsTrapFileSetDate, D2;
+  move.l #vfsTrapFileSetDate, D2;
  end;
  VFSFileSetDate := __VFSFileSetDate(fileRef, whichDate, date);
 end;
@@ -623,7 +623,7 @@ end;
 function VFSDirCreate(volRefNum: UInt16; const dirNameP: PChar): Err;
 begin
  asm
-  move.l #$vfsTrapDirCreate, D2;
+  move.l #vfsTrapDirCreate, D2;
  end;
  VFSDirCreate := __VFSDirCreate(volRefNum, dirNameP);
 end;
@@ -631,7 +631,7 @@ end;
 function VFSDirEntryEnumerate(dirRef: FileRef; var dirEntryIteratorP: UInt32; var infoP: FileInfoType): Err;
 begin
  asm
-  move.l #$vfsTrapDirEntryEnumerate, D2;
+  move.l #vfsTrapDirEntryEnumerate, D2;
  end;
  VFSDirEntryEnumerate := __VFSDirEntryEnumerate(dirRef, dirEntryIteratorP, infoP);
 end;
@@ -640,7 +640,7 @@ function VFSGetDefaultDirectory(volRefNum: UInt16; const fileTypeStr: PChar;
                                 pathStr: PChar; var bufLenP: UInt16): Err;
 begin
  asm
-  move.l #$vfsTrapGetDefaultDirectory, D2;
+  move.l #vfsTrapGetDefaultDirectory, D2;
  end;
  VFSGetDefaultDirectory := __VFSGetDefaultDirectory(volRefNum, fileTypeStr, pathStr, bufLenP);
 end;
@@ -649,7 +649,7 @@ function VFSRegisterDefaultDirectory(const fileTypeStr: PChar; mediaType: UInt32
                                      const pathStr: PChar): Err;
 begin
  asm
-  move.l #$vfsTrapRegisterDefaultDirectory, D2;
+  move.l #vfsTrapRegisterDefaultDirectory, D2;
  end;
  VFSRegisterDefaultDirectory := __VFSRegisterDefaultDirectory(fileTypeStr, mediaType, pathStr);
 end;
@@ -657,7 +657,7 @@ end;
 function VFSUnregisterDefaultDirectory(const fileTypeStr: PChar; mediaType: UInt32): Err;
 begin
  asm
-  move.l #$vfsTrapUnregisterDefaultDirectory, D2;
+  move.l #vfsTrapUnregisterDefaultDirectory, D2;
  end;
  VFSUnregisterDefaultDirectory := __VFSUnregisterDefaultDirectory(fileTypeStr, mediaType);
 end;
@@ -665,7 +665,7 @@ end;
 function VFSVolumeFormat(flags: UInt8; fsLibRefNum: UInt16; vfsMountParamP: VFSAnyMountParamPtr): Err;
 begin
  asm
-  move.l #$vfsTrapVolumeFormat, D2;
+  move.l #vfsTrapVolumeFormat, D2;
  end;
  VFSVolumeFormat := __VFSVolumeFormat(flags, fsLibRefNum, vfsMountParamP);
 end;
@@ -673,7 +673,7 @@ end;
 function VFSVolumeMount(flags: UInt8; fsLibRefNum: UInt16; vfsMountParamP: VFSAnyMountParamPtr): Err;
 begin
  asm
-  move.l #$vfsTrapVolumeMount, D2;
+  move.l #vfsTrapVolumeMount, D2;
  end;
  VFSVolumeMount := __VFSVolumeMount(flags, fsLibRefNum, vfsMountParamP);
 end;
@@ -681,7 +681,7 @@ end;
 function VFSVolumeUnmount(volRefNum: UInt16): Err;
 begin
  asm
-  move.l #$vfsTrapVolumeUnmount, D2;
+  move.l #vfsTrapVolumeUnmount, D2;
  end;
  VFSVolumeUnmount := __VFSVolumeUnmount(volRefNum);
 end;
@@ -689,7 +689,7 @@ end;
 function VFSVolumeEnumerate(var volRefNumP: UInt16; var volIteratorP: UInt32): Err;
 begin
  asm
-  move.l #$vfsTrapVolumeEnumerate, D2;
+  move.l #vfsTrapVolumeEnumerate, D2;
  end;
  VFSVolumeEnumerate := __VFSVolumeEnumerate(volRefNumP, volIteratorP);
 end;
@@ -697,7 +697,7 @@ end;
 function VFSVolumeInfo(volRefNum: UInt16; var volInfoP: VolumeInfoType): Err;
 begin
  asm
-  move.l #$vfsTrapVolumeInfo, D2;
+  move.l #vfsTrapVolumeInfo, D2;
  end;
  VFSVolumeInfo := __VFSVolumeInfo(volRefNum, volInfoP);
 end;
@@ -705,7 +705,7 @@ end;
 function VFSVolumeGetLabel(volRefNum: UInt16; labelP: PChar; bufLen: UInt16): Err;
 begin
  asm
-  move.l #$vfsTrapVolumeGetLabel, D2;
+  move.l #vfsTrapVolumeGetLabel, D2;
  end;
  VFSVolumeGetLabel := __VFSVolumeGetLabel(volRefNum, labelP, bufLen);
 end;
@@ -713,7 +713,7 @@ end;
 function VFSVolumeSetLabel(volRefNum: UInt16; const labelP: PChar): Err;
 begin
  asm
-  move.l #$vfsTrapVolumeSetLabel, D2;
+  move.l #vfsTrapVolumeSetLabel, D2;
  end;
  VFSVolumeSetLabel := __VFSVolumeSetLabel(volRefNum, labelP);
 end;
@@ -721,7 +721,7 @@ end;
 function VFSVolumeSize(volRefNum: UInt16; var volumeUsedP, volumeTotalP: UInt32): Err;
 begin
  asm
-  move.l #$vfsTrapVolumeSize, D2;
+  move.l #vfsTrapVolumeSize, D2;
  end;
  VFSVolumeSize := __VFSVolumeSize(volRefNum, volumeUsedP, volumeTotalP);
 end;
@@ -729,7 +729,7 @@ end;
 function VFSInstallFSLib(creator: UInt32; var fsLibRefNumP: UInt16): Err;
 begin
  asm
-  move.l #$vfsTrapInstallFSLib, D2;
+  move.l #vfsTrapInstallFSLib, D2;
  end;
  VFSInstallFSLib := __VFSInstallFSLib(creator, fsLibRefNumP);
 end;
@@ -737,7 +737,7 @@ end;
 function VFSRemoveFSLib(fsLibRefNum: UInt16): Err;
 begin
  asm
-  move.l #$vfsTrapRemoveFSLib, D2;
+  move.l #vfsTrapRemoveFSLib, D2;
  end;
  VFSRemoveFSLib := __VFSRemoveFSLib(fsLibRefNum);
 end;
@@ -746,7 +746,7 @@ function VFSImportDatabaseFromFile(volRefNum: UInt16; const pathNameP: PChar;
                                    var cardNoP: UInt16; var dbIDP: LocalID): Err;
 begin
  asm
-  move.l #$vfsTrapImportDatabaseFromFile, D2;
+  move.l #vfsTrapImportDatabaseFromFile, D2;
  end;
  VFSImportDatabaseFromFile := __VFSImportDatabaseFromFile(volRefNum, pathNameP, cardNoP, dbIDP);
 end;
@@ -756,7 +756,7 @@ function VFSImportDatabaseFromFileCustom(volRefNum: UInt16; const pathNameP: PCh
                                          importProcP: VFSImportProcPtr; userDataP: Pointer): Err;
 begin
  asm
-  move.l #$vfsTrapImportDatabaseFromFileCustom, D2;
+  move.l #vfsTrapImportDatabaseFromFileCustom, D2;
  end;
  VFSImportDatabaseFromFileCustom := __VFSImportDatabaseFromFileCustom(volRefNum, pathNameP,
                                     cardNoP, dbIDP, importProcP, userDataP);
@@ -766,7 +766,7 @@ function VFSExportDatabaseToFile(volRefNum: UInt16; const pathNameP: PChar;
                                  cardNo: UInt16; dbID: LocalID): Err;
 begin
  asm
-  move.l #$vfsTrapExportDatabaseToFile, D2;
+  move.l #vfsTrapExportDatabaseToFile, D2;
  end;
  VFSExportDatabaseToFile := __VFSExportDatabaseToFile(volRefNum, pathNameP, cardNo, dbID);
 end;
@@ -776,7 +776,7 @@ function VFSExportDatabaseToFileCustom(volRefNum: UInt16; const pathNameP: PChar
                                        exportProcP: VFSExportProcPtr; userDataP: Pointer): Err;
 begin
  asm
-  move.l #$vfsTrapExportDatabaseToFileCustom, D2;
+  move.l #vfsTrapExportDatabaseToFileCustom, D2;
  end;
  VFSExportDatabaseToFileCustom := __VFSExportDatabaseToFileCustom(volRefNum, pathNameP,
                                   cardNo, dbID, exportProcP, userDataP);
@@ -785,7 +785,7 @@ end;
 function VFSFileDBGetResource(ref: FileRef; type_: DmResType; resID: DmResID; var resHP: MemHandle): Err;
 begin
  asm
-  move.l #$vfsTrapFileDBGetResource, D2;
+  move.l #vfsTrapFileDBGetResource, D2;
  end;
  VFSFileDBGetResource := __VFSFileDBGetResource(ref, type_, resID, resHP);
 end;
@@ -796,7 +796,7 @@ function VFSFileDBInfo(ref: FileRef; nameP: PChar; var attributesP, versionP: UI
                        var numRecordsP: UInt16): Err;
 begin
  asm
-  move.l #$vfsTrapFileDBInfo, D2;
+  move.l #vfsTrapFileDBInfo, D2;
  end;
  VFSFileDBInfo := __VFSFileDBInfo(ref, nameP, attributesP, versionP, crDateP, modDateP,
                   bckUpDateP, modNumP, appInfoHP, sortInfoHP, typeP, creatorP, numRecordsP);
@@ -806,7 +806,7 @@ function VFSFileDBGetRecord(ref: FileRef; recIndex: UInt16; var recHP: MemHandle
                             var recAttrP: UInt8; var uniqueIDP: UInt32): Err;
 begin
  asm
-  move.l #$vfsTrapFileDBGetRecord, D2;
+  move.l #vfsTrapFileDBGetRecord, D2;
  end;
  VFSFileDBGetRecord := __VFSFileDBGetRecord(ref, recIndex, recHP, recAttrP, uniqueIDP);
 end;