* changed i386 to cpui386

rtl/bsd/ossysc.inc

@@ -140,7 +140,7 @@ end;
 Function Fpmmap(start:pointer;len:size_t;prot:cint;flags:cint;fd:cint;offst:off_t):pointer; [public, alias:  'FPC_SYSC_MMAP'];
 
 begin
-  Fpmmap:=pointer(longint(do_syscall(syscall_nr_mmap,TSysParam(Start),Len,Prot,Flags,fd,{$ifdef cpupowerpc}0,{$endif}offst{$ifdef i386},0{$endif})));
+  Fpmmap:=pointer(longint(do_syscall(syscall_nr_mmap,TSysParam(Start),Len,Prot,Flags,fd,{$ifdef cpupowerpc}0,{$endif}offst{$ifdef cpui386},0{$endif})));
 end;
 
 {$endif}
@@ -599,7 +599,10 @@ end;
 
 {
  $Log$
- Revision 1.12  2003-09-27 13:45:58  peter
+ Revision 1.13  2003-10-17 22:10:30  olle
+   * changed i386 to cpui386
+
+ Revision 1.12  2003/09/27 13:45:58  peter
    * fpnanosleep exported in baseunix
    * fpnanosleep has pointer arguments to be C compliant
 

rtl/linux/unixsysc.inc

@@ -117,7 +117,7 @@ end;
       Port IO functions
 --------------------------------}
 
-{$ifdef i386}
+{$ifdef cpui386}
 
 Function  IOperm (From,Num : Cardinal; Value : Longint) : boolean;
 {
@@ -145,11 +145,14 @@ begin
   LinuxError:=fpgetErrno;
 end;
 
-{$endif i386}
+{$endif cpui386}
 
 {
   $Log$
-  Revision 1.13  2003-09-20 12:45:34  marco
+  Revision 1.14  2003-10-17 22:11:28  olle
+    * changed i386 to cpui386
+
+  Revision 1.13  2003/09/20 12:45:34  marco
    * Small fix. Cycle works
 
   Revision 1.12  2003/09/16 21:46:27  marco

rtl/netware/system.pp

@@ -23,9 +23,9 @@ interface
   {$define SYSTEMEXCEPTIONDEBUG}
 {$endif SYSTEMDEBUG}
 
-{$ifdef i386}
+{$ifdef cpui386}
   {$define Set_i386_Exception_handler}
-{$endif i386}
+{$endif cpui386}
 
 
 { include system-independent routine headers }
@@ -812,7 +812,10 @@ Begin
 End.
 {
   $Log$
-  Revision 1.18  2003-09-27 11:52:35  peter
+  Revision 1.19  2003-10-17 22:12:02  olle
+    * changed i386 to cpui386
+
+  Revision 1.18  2003/09/27 11:52:35  peter
     * sbrk returns pointer
 
   Revision 1.17  2003/03/25 18:17:54  armin

rtl/unix/dos.pp

@@ -77,14 +77,14 @@ Type
 {$i filerec.inc}
 {$i textrec.inc}
 
-{$ifdef i386}
+{$ifdef cpui386}
   Registers = packed record
     case i : integer of
      0 : (ax,f1,bx,f2,cx,f3,dx,f4,bp,f5,si,f51,di,f6,ds,f7,es,f8,flags,fs,gs : word);
      1 : (al,ah,f9,f10,bl,bh,f11,f12,cl,ch,f13,f14,dl,dh : byte);
      2 : (eax, ebx, ecx, edx, ebp, esi, edi : longint);
     End;
-{$endif i386}
+{$endif cpui386}
 
   DateTime = packed record
     Year,
@@ -137,10 +137,10 @@ Function  EnvStr(index: integer): string;
 Function  GetEnv (envvar: string): string;
 
 {Do Nothing Functions, no Linux version}
-{$ifdef i386}
+{$ifdef cpui386}
 Procedure Intr(intno: byte; var regs: registers);
 Procedure MSDos(var regs: registers);
-{$endif i386}
+{$endif cpui386}
 Procedure SwapVectors;
 Procedure GetIntVec(intno: byte; var vector: pointer);
 Procedure SetIntVec(intno: byte; vector: pointer);
@@ -787,7 +787,7 @@ End;
                       --- Do Nothing Procedures/Functions ---
 ******************************************************************************}
 
-{$ifdef i386}
+{$ifdef cpui386}
 Procedure Intr (intno: byte; var regs: registers);
 Begin
   {! No Linux equivalent !}
@@ -799,7 +799,7 @@ Procedure msdos(var regs : registers);
 Begin
   {! No Linux equivalent !}
 End;
-{$endif i386}
+{$endif cpui386}
 
 
 
@@ -903,7 +903,10 @@ End.
 
 {
   $Log$
-  Revision 1.18  2003-09-27 12:51:33  peter
+  Revision 1.19  2003-10-17 22:13:30  olle
+    * changed i386 to cpui386
+
+  Revision 1.18  2003/09/27 12:51:33  peter
     * fpISxxx macros renamed to C compliant fpS_ISxxx
 
   Revision 1.17  2003/09/17 17:30:46  marco

rtl/unix/linuxold.inc

@@ -428,7 +428,7 @@ function MUnMap (P : Pointer; Size : Longint) : Boolean;
 
 //Function  IOperm (From,Num : Cardinal; Value : Longint) : boolean;
 //Function  IoPL(Level : longint) : Boolean;
-{$ifdef i386}
+{$ifdef cpui386}
 Procedure WritePort (Port : Longint; Value : Byte);
 Procedure WritePort (Port : Longint; Value : Word);
 Procedure WritePort (Port : Longint; Value : Longint);
@@ -2854,7 +2854,7 @@ end;
       Memory functions
 --------------------------------}
 
-{$IFDEF I386}
+{$IFDEF cpui386}
 Procedure WritePort (Port : Longint; Value : Byte);
 {
   Writes 'Value' to port 'Port'
@@ -3131,7 +3131,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.8  2003-09-29 14:36:06  peter
+  Revision 1.9  2003-10-17 22:13:30  olle
+    * changed i386 to cpui386
+
+  Revision 1.8  2003/09/29 14:36:06  peter
     * fixed for stricter compiler
 
   Revision 1.7  2003/09/27 13:49:41  peter

rtl/unix/liunsysc.inc

@@ -608,7 +608,7 @@ end;
       Port IO functions
 --------------------------------}
 
-{$ifdef i386}
+{$ifdef cpui386}
 {
 Function  IOperm (From,Num : Cardinal; Value : Longint) : boolean;
 {
@@ -634,11 +634,14 @@ begin
   LinuxError:=fpgetErrno;
 end;
 }
-{$endif i386}
+{$endif cpui386}
 
 {
   $Log$
-  Revision 1.5  2003-09-20 17:27:05  marco
+  Revision 1.6  2003-10-17 22:13:30  olle
+    * changed i386 to cpui386
+
+  Revision 1.5  2003/09/20 17:27:05  marco
    * mmap fix.
 
   Revision 1.4  2003/09/16 20:52:24  marco

rtl/unix/video.pp

@@ -40,9 +40,9 @@ const
   logend: string = #10#10;
 {$endif logging}
 
-{$ifdef I386}
+{$ifdef cpui386}
 {$ASMMODE ATT}
-{$endif I386}
+{$endif cpui386}
 
 const
 
@@ -706,7 +706,7 @@ var
 begin
   if not force then
    begin
-{$ifdef i386}
+{$ifdef cpui386}
      asm
           movl    VideoBuf,%esi
           movl    OldVideoBuf,%edi
@@ -716,7 +716,7 @@ begin
           cmpsl
           setne   DoUpdate
      end;
-{$else not i386}
+{$else not cpui386}
      p1:=plongint(VideoBuf);
      p2:=plongint(OldVideoBuf);
      for i:=0 to VideoBufSize div 2 do
@@ -731,7 +731,7 @@ begin
            inc(p1);
            inc(p2);
          end;
-{$endif not i386}
+{$endif not cpui386}
    end
   else
    DoUpdate:=true;
@@ -826,7 +826,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.14  2003-09-14 20:15:01  marco
+  Revision 1.15  2003-10-17 22:13:30  olle
+    * changed i386 to cpui386
+
+  Revision 1.14  2003/09/14 20:15:01  marco
    * Unix reform stage two. Remove all calls from Unix that exist in Baseunix.
 
   Revision 1.13  2003/03/26 12:45:21  armin

rtl/win32/system.pp

@@ -24,9 +24,9 @@ interface
   {$define SYSTEMEXCEPTIONDEBUG}
 {$endif SYSTEMDEBUG}
 
-{$ifdef i386}
+{$ifdef cpui386}
   {$define Set_i386_Exception_handler}
-{$endif i386}
+{$endif cpui386}
 
 { include system-independent routine headers }
 {$I systemh.inc}
@@ -1389,7 +1389,7 @@ begin
         SetUnhandledExceptionFilter(nil);
 end;
 
-{$else not i386 (Processor specific !!)}
+{$else not cpui386 (Processor specific !!)}
 procedure install_exception_handlers;
 begin
 end;
@@ -1539,7 +1539,10 @@ end.
 
 {
   $Log$
-  Revision 1.46  2003-10-16 15:43:13  peter
+  Revision 1.47  2003-10-17 22:15:10  olle
+    * changed i386 to cpui386
+
+  Revision 1.46  2003/10/16 15:43:13  peter
     * THandle is platform dependent
 
   Revision 1.45  2003/10/06 23:52:53  florian