* ifdef newppu -> ifndef oldppu

This commit is contained in:
peter 1998-06-24 14:48:34 +00:00
parent fe323891cf
commit 804397de24
6 changed files with 113 additions and 95 deletions

View File

@ -27,7 +27,7 @@ unit files;
uses
cobjects,globals
{$ifdef NEWPPU}
{$ifndef OLDPPU}
,ppu
{$endif}
;
@ -89,7 +89,7 @@ unit files;
pmodule = ^tmodule;
tmodule = object(tlinkedlist_item)
{$ifdef NEWPPU}
{$ifndef OLDPPU}
ppufile : pppufile; { the PPU file }
{$else}
ppufile : pextfile; { the PPU file }
@ -131,13 +131,13 @@ unit files;
mainsource : pstring; { name of the main sourcefile }
constructor init(const s:string;_is_unit:boolean);
{$ifdef NEWPPU}
{$ifndef OLDPPU}
destructor done;virtual;
{$else}
destructor special_done;virtual; { this is to be called only when compiling again }
{$endif NEWPPU}
{$endif OLDPPU}
procedure setfilename(const _path,name:string);
{$ifdef NEWPPU}
{$ifndef OLDPPU}
function openppu:boolean;
{$else}
function load_ppu(const unit_path,n,ext:string):boolean;
@ -148,21 +148,21 @@ unit files;
pused_unit = ^tused_unit;
tused_unit = object(tlinkedlist_item)
unitid : word;
{$ifdef NEWPPU}
{$ifndef OLDPPU}
name : pstring;
checksum : longint;
loaded : boolean;
{$endif NEWPPU}
{$endif OLDPPU}
in_uses,
in_interface,
is_stab_written : boolean;
u : pmodule;
{$ifdef NEWPPU}
{$ifndef OLDPPU}
constructor init(_u : pmodule;intface:boolean);
constructor init_to_load(const n:string;c:longint;intface:boolean);
{$else NEWPPU}
{$else OLDPPU}
constructor init(_u : pmodule;f : byte);
{$endif NEWPPU}
{$endif OLDPPU}
destructor done;virtual;
end;
@ -239,7 +239,7 @@ unit files;
var
main_module : pmodule; { Main module of the program }
current_module : pmodule; { Current module which is compiled }
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu : pppufile; { Current ppufile which is read }
{$endif}
global_unit_count : word;
@ -380,7 +380,7 @@ unit files;
libfilename:=stringdup(s+target_os.staticlibext);
end;
{$ifdef NEWPPU}
{$ifndef OLDPPU}
function tmodule.openppu:boolean;
var
@ -552,7 +552,7 @@ unit files;
search_unit:=Found;
end;
{$else NEWPPU}
{$else OLDPPU}
{*****************************************************************************
@ -804,7 +804,7 @@ unit files;
search_unit:=Found;
end;
{$endif NEWPPU}
{$endif OLDPPU}
constructor tmodule.init(const s:string;_is_unit:boolean);
@ -861,7 +861,7 @@ unit files;
end;
{$ifdef NEWPPU}
{$ifndef OLDPPU}
destructor tmodule.done;
begin
if assigned(map) then
@ -905,13 +905,13 @@ unit files;
inherited done;
end;
{$endif NEWPPU}
{$endif OLDPPU}
{****************************************************************************
TUSED_UNIT
****************************************************************************}
{$ifdef NEWPPU}
{$ifndef OLDPPU}
constructor tused_unit.init(_u : pmodule;intface:boolean);
begin
@ -945,7 +945,7 @@ unit files;
inherited done;
end;
{$else NEWPPU}
{$else OLDPPU}
constructor tused_unit.init(_u : pmodule;f : byte);
begin
@ -961,14 +961,17 @@ unit files;
inherited done;
end;
{$endif NEWPPU}
{$endif OLDPPU}
end.
{
$Log$
Revision 1.26 1998-06-17 14:36:19 peter
* forgot an $ifdef NEWPPU :(
Revision 1.27 1998-06-24 14:48:34 peter
* ifdef newppu -> ifndef oldppu
Revision 1.26 1998/06/17 14:36:19 peter
* forgot an $ifndef OLDPPU :(
Revision 1.25 1998/06/17 14:10:11 peter
* small os2 fixes
@ -1019,7 +1022,7 @@ end.
Revision 1.14 1998/05/27 19:45:02 peter
* symtable.pas splitted into includefiles
* symtable adapted for $ifdef NEWPPU
* symtable adapted for $ifndef OLDPPU
Revision 1.13 1998/05/23 01:21:05 peter
+ aktasmmode, aktoptprocessor, aktoutputformat
@ -1047,7 +1050,7 @@ end.
- removed old style messages
Revision 1.10 1998/05/11 13:07:53 peter
+ $ifdef NEWPPU for the new ppuformat
+ $ifndef OLDPPU for the new ppuformat
+ $define GDB not longer required
* removed all warnings and stripped some log comments
* no findfirst/findnext anymore to remove smartlink *.o files

View File

@ -40,9 +40,9 @@ unit pmodules;
cobjects,verbose,systems,globals,
symtable,aasm,hcodegen,
link,assemble,import
{$ifdef NEWPPU}
{$ifndef OLDPPU}
,ppu
{$endif NEWPPU}
{$endif OLDPPU}
{$ifdef i386}
,i386
{$endif}
@ -141,7 +141,7 @@ unit pmodules;
end;
{$ifdef NEWPPU}
{$ifndef OLDPPU}
function loadunit(const s : string;compile_system:boolean) : pmodule;forward;
@ -330,7 +330,7 @@ unit pmodules;
loadunit:=hp;
end;
{$else NEWPPU}
{$else OLDPPU}
{*****************************************************************************
@ -589,7 +589,7 @@ unit pmodules;
loadunit:=hp;
end;
{$endif NEWPPU}
{$endif OLDPPU}
procedure loadsystemunit;
@ -600,17 +600,17 @@ unit pmodules;
will be loaded }
if not(cs_compilesystem in aktswitches) then
begin
{$ifdef NEWPPU}
{$ifndef OLDPPU}
hp:=loadunit(upper(target_info.system_unit),true);
systemunit:=hp^.symtable;
{ add to the used units }
current_module^.used_units.concat(new(pused_unit,init(hp,true)));
{$else NEWPPU}
{$else OLDPPU}
hp:=loadunit(upper(target_info.system_unit),true,true);
systemunit:=hp^.symtable;
{ add to the used units }
current_module^.used_units.concat(new(pused_unit,init(hp,0)));
{$endif NEWPPU}
{$endif OLDPPU}
{ read default constant definitions }
make_ref:=false;
readconstdefs;
@ -647,14 +647,14 @@ unit pmodules;
repeat
s:=pattern;
consume(ID);
{$ifdef NEWPPU}
{$ifndef OLDPPU}
hp2:=loadunit(s,false);
{ the current module uses the unit hp2 }
current_module^.used_units.concat(new(pused_unit,init(hp2,not current_module^.in_implementation)));
pused_unit(current_module^.used_units.last)^.in_uses:=true;
{$else NEWPPU}
{$else OLDPPU}
hp2:=loadunit(s,false,true);
{$endif NEWPPU}
{$endif OLDPPU}
if current_module^.compiled then
exit;
refsymtable^.insert(new(punitsym,init(s,hp2^.symtable)));
@ -1131,7 +1131,10 @@ unit pmodules;
end.
{
$Log$
Revision 1.30 1998-06-17 14:10:16 peter
Revision 1.31 1998-06-24 14:48:35 peter
* ifdef newppu -> ifndef oldppu
Revision 1.30 1998/06/17 14:10:16 peter
* small os2 fixes
* fixed interdependent units with newppu (remake3 under linux works now)

View File

@ -41,7 +41,7 @@ unit pstatmnt;
uses
cobjects,globals,files,verbose,systems,
symtable,aasm,pass_1,types,scanner,hcodegen
{$ifdef NEWPPU}
{$ifndef OLDPPU}
,ppu
{$endif}
,pbase,pexpr,pdecl
@ -1136,7 +1136,10 @@ unit pstatmnt;
end.
{
$Log$
Revision 1.21 1998-06-24 14:06:34 peter
Revision 1.22 1998-06-24 14:48:36 peter
* ifdef newppu -> ifndef oldppu
Revision 1.21 1998/06/24 14:06:34 peter
* fixed the name changes
Revision 1.20 1998/06/23 14:00:16 peter

View File

@ -387,7 +387,7 @@
procedure tstringdef.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
case string_typ of
shortstring:
writebyte(ibstringdef);
@ -404,7 +404,7 @@
writebyte(len)
else
writelong(len);
{$ifdef NEWPPU}
{$ifndef OLDPPU}
case string_typ of
shortstring : current_ppu^.writeentry(ibstringdef);
longstring : current_ppu^.writeentry(iblongstringdef);
@ -529,12 +529,12 @@
procedure tenumdef.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(ibenumdef);
{$endif}
tdef.write;
writelong(max);
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(ibenumdef);
{$endif}
end;
@ -691,14 +691,14 @@
procedure torddef.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(iborddef);
{$endif}
tdef.write;
writebyte(byte(typ));
writelong(low);
writelong(high);
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(iborddef);
{$endif}
end;
@ -766,12 +766,12 @@
procedure tfloatdef.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(ibfloatdef);
{$endif}
tdef.write;
writebyte(byte(typ));
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(ibfloatdef);
{$endif}
end;
@ -884,14 +884,14 @@
procedure tfiledef.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(ibfiledef);
{$endif}
tdef.write;
writebyte(byte(filetype));
if filetype=ft_typed then
writedefref(typed_as);
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(ibfiledef);
{$endif}
end;
@ -1007,12 +1007,12 @@
procedure tpointerdef.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(ibpointerdef);
{$endif}
tdef.write;
writedefref(definition);
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(ibpointerdef);
{$endif}
end;
@ -1093,12 +1093,12 @@
procedure tclassrefdef.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(ibclassrefdef);
{$endif}
tdef.write;
writedefref(definition);
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(ibclassrefdef);
{$endif}
end;
@ -1168,7 +1168,7 @@
procedure tsetdef.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(ibsetdef);
{$endif}
tdef.write;
@ -1176,7 +1176,7 @@
writebyte(byte(settype));
if settype=varset then
writelong(savesize);
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(ibsetdef);
{$endif}
end;
@ -1235,11 +1235,11 @@
procedure tformaldef.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(ibformaldef);
{$endif}
tdef.write;
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(ibformaldef);
{$endif}
end;
@ -1318,7 +1318,7 @@
procedure tarraydef.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(ibarraydef);
{$endif}
tdef.write;
@ -1326,7 +1326,7 @@
writedefref(rangedef);
writelong(lowrange);
writelong(highrange);
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(ibarraydef);
{$endif}
end;
@ -1477,12 +1477,12 @@
begin
oldread_member:=read_member;
read_member:=true;
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(ibrecorddef);
{$endif}
tdef.write;
writelong(savesize);
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(ibrecorddef);
{$endif}
self.symtable^.writeasstruct;
@ -1867,7 +1867,7 @@
{$ifdef UseBrowser}
{$ifdef NEWPPU}
{$ifndef OLDPPU}
procedure tprocdef.load_references;
var
@ -1906,7 +1906,7 @@
lastwritten:=lastref;
end;
{$else NEWPPU}
{$else OLDPPU}
procedure tprocdef.load_references;
var
@ -1977,7 +1977,7 @@
end;
{$endif NEWPPU}
{$endif OLDPPU}
procedure tprocdef.add_to_browserlog;
begin
@ -2011,7 +2011,7 @@
procedure tprocdef.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(ibprocdef);
{$endif}
inherited write;
@ -2048,7 +2048,7 @@
writeptree(ptree(code));
}
end;
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(ibprocdef);
{$endif}
end;
@ -2204,7 +2204,7 @@
procedure tprocvardef.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(ibprocvardef);
{$endif}
{ here we cannot get a real good value so just give something }
@ -2216,7 +2216,7 @@
fpu_used:=0;
{$endif StoreFPULevel}
inherited write;
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(ibprocvardef);
{$endif}
end;
@ -2460,7 +2460,7 @@
begin
oldread_member:=read_member;
read_member:=true;
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(ibobjectdef);
{$endif}
tdef.write;
@ -2468,7 +2468,7 @@
writestring(name^);
writedefref(childof);
writelong(options);
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(ibobjectdef);
{$endif}
if (options and (oo_hasprivate or oo_hasprotected))<>0 then
@ -2644,7 +2644,10 @@
{
$Log$
Revision 1.14 1998-06-16 08:56:31 peter
Revision 1.15 1998-06-24 14:48:37 peter
* ifdef newppu -> ifndef oldppu
Revision 1.14 1998/06/16 08:56:31 peter
+ targetcpu
* cleaner pmodules for newppu
@ -2697,7 +2700,7 @@
Revision 1.1 1998/05/27 19:45:09 peter
* symtable.pas splitted into includefiles
* symtable adapted for $ifdef NEWPPU
* symtable adapted for $ifndef OLDPPU
}

View File

@ -32,7 +32,7 @@
{$ENDIF}
{$ifdef NEWPPU}
{$ifndef OLDPPU}
{*****************************************************************************
PPU Writing
@ -431,7 +431,7 @@
end;
{$else NEWPPU}
{$else OLDPPU}
{*****************************************************************************
@ -693,11 +693,14 @@
{$endif NEWPPU}
{$endif OLDPPU}
{
$Log$
Revision 1.4 1998-06-16 08:56:32 peter
Revision 1.5 1998-06-24 14:48:39 peter
* ifdef newppu -> ifndef oldppu
Revision 1.4 1998/06/16 08:56:32 peter
+ targetcpu
* cleaner pmodules for newppu

View File

@ -76,7 +76,7 @@
{$ifdef UseBrowser}
{$ifdef NEWPPU}
{$ifndef OLDPPU}
procedure tsym.load_references;
var
@ -127,7 +127,7 @@
end;
end;
{$else NEWPPU}
{$else OLDPPU}
procedure tsym.load_references;
@ -214,7 +214,7 @@
ppufile.do_crc:=true;
end;
{$endif NEWPPU}
{$endif OLDPPU}
procedure tsym.add_to_browserlog;
var
@ -509,12 +509,12 @@
procedure tprocsym.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(ibprocsym);
{$endif}
tsym.write;
writedefref(pdef(definition));
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(ibprocsym);
{$endif}
end;
@ -655,7 +655,7 @@
procedure tpropertysym.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(ibpropertysym);
{$endif}
tsym.write;
@ -672,7 +672,7 @@
writestring('');
writedefref(readaccessdef);
writedefref(writeaccessdef);
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(ibpropertysym);
{$endif}
end;
@ -741,7 +741,7 @@
procedure tabsolutesym.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(ibabsolutesym);
{$endif}
tsym.write;
@ -755,7 +755,7 @@
toasm : writestring(asmname^);
toaddr : writelong(address);
end;
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(ibabsolutesym);
{$endif}
end;
@ -882,7 +882,7 @@
procedure tvarsym.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
if (var_options and vo_is_C_var)<>0 then
writebyte(ibvarsym_C)
else
@ -900,7 +900,7 @@
writebyte(var_options);
writestring(mangledname);
end;
{$ifdef NEWPPU}
{$ifndef OLDPPU}
if (var_options and vo_is_C_var)<>0 then
current_ppu^.writeentry(ibvarsym_C)
else
@ -1234,13 +1234,13 @@
procedure ttypedconstsym.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(ibtypedconstsym);
{$endif}
tsym.write;
writedefref(definition);
writestring(prefix^);
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(ibtypedconstsym);
{$endif}
end;
@ -1368,7 +1368,7 @@
procedure tconstsym.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(ibconstsym);
{$endif}
tsym.write;
@ -1388,7 +1388,7 @@
{***}
else internalerror(13);
end;
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(ibconstsym);
{$endif}
end;
@ -1492,13 +1492,13 @@
procedure tenumsym.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(ibenumsym);
{$endif}
tsym.write;
writedefref(definition);
writelong(value);
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(ibenumsym);
{$endif}
end;
@ -1569,12 +1569,12 @@
procedure ttypesym.write;
begin
{$ifndef NEWPPU}
{$ifdef OLDPPU}
writebyte(ibtypesym);
{$endif}
tsym.write;
writedefref(definition);
{$ifdef NEWPPU}
{$ifndef OLDPPU}
current_ppu^.writeentry(ibtypesym);
{$endif}
end;
@ -1647,7 +1647,10 @@
{
$Log$
Revision 1.16 1998-06-19 15:40:42 peter
Revision 1.17 1998-06-24 14:48:40 peter
* ifdef newppu -> ifndef oldppu
Revision 1.16 1998/06/19 15:40:42 peter
* removed cosntructor/constructor warning and 0.99.5 recompiles it again
Revision 1.15 1998/06/17 14:10:18 peter
@ -1711,7 +1714,7 @@
Revision 1.1 1998/05/27 19:45:09 peter
* symtable.pas splitted into includefiles
* symtable adapted for $ifdef NEWPPU
* symtable adapted for $ifndef OLDPPU
}