paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-07 04:19:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

* factored out the intialization of uinttype/sinttype/ptruinttype/ptrsinttype

Browse Source 
from create_intern_types and load_intern_types (+ the version from
    load_intern_types was out-of-date)

git-svn-id: trunk@21278 -
This commit is contained in:
Jonas Maebe 2012-05-12 16:03:02 +00:00
parent 264a013087
commit c1b1eadb98
1 changed files with 34 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
compiler/psystem.pas
View File

@ -106,6 +106,38 @@ implementation
end; end;
procedure set_default_int_types;
begin
{$ifdef cpu64bitaddr}
uinttype:=u64inttype;
sinttype:=s64inttype;
ptruinttype:=u64inttype;
ptrsinttype:=s64inttype;
{$endif cpu64bitaddr}
{$ifdef cpu32bitaddr}
uinttype:=u32inttype;
sinttype:=s32inttype;
ptruinttype:=u32inttype;
ptrsinttype:=s32inttype;
{$endif cpu32bitaddr}
{$ifdef cpu32bitalu}
uinttype:=u32inttype;
sinttype:=s32inttype;
{$endif cpu32bitalu}
{$ifdef cpu16bitaddr}
ptruinttype:=u16inttype;
ptrsinttype:=s16inttype;
{$endif cpu16bitaddr}
{$ifdef cpu16bitalu}
uinttype:=u16inttype;
sinttype:=s16inttype;
{$endif cpu16bitalu}
{$ifdef cpu8bitalu}
uinttype:=u8inttype;
sinttype:=s8inttype;
{$endif cpu8bitalu}
end;
procedure create_intern_types; procedure create_intern_types;
{ {
all the types inserted into the system unit all the types inserted into the system unit
@ -223,34 +255,7 @@ implementation
create_fpu_types; create_fpu_types;
s64currencytype:=torddef.create(scurrency,low(int64),high(int64)); s64currencytype:=torddef.create(scurrency,low(int64),high(int64));
{$endif jvm} {$endif jvm}
{$ifdef cpu64bitaddr} set_default_int_types;
uinttype:=u64inttype;
sinttype:=s64inttype;
ptruinttype:=u64inttype;
ptrsinttype:=s64inttype;
{$endif cpu64bitaddr}
{$ifdef cpu32bitaddr}
uinttype:=u32inttype;
sinttype:=s32inttype;
ptruinttype:=u32inttype;
ptrsinttype:=s32inttype;
{$endif cpu32bitaddr}
{$ifdef cpu32bitalu}
uinttype:=u32inttype;
sinttype:=s32inttype;
{$endif cpu32bitalu}
{$ifdef cpu16bitaddr}
ptruinttype:=u16inttype;
ptrsinttype:=s16inttype;
{$endif cpu16bitaddr}
{$ifdef cpu16bitalu}
uinttype:=u16inttype;
sinttype:=s16inttype;
{$endif cpu16bitalu}
{$ifdef cpu8bitalu}
uinttype:=u8inttype;
sinttype:=s8inttype;
{$endif cpu8bitalu}
{ some other definitions } { some other definitions }
voidpointertype:=tpointerdef.create(voidtype); voidpointertype:=tpointerdef.create(voidtype);
charpointertype:=tpointerdef.create(cansichartype); charpointertype:=tpointerdef.create(cansichartype);
@ -485,24 +490,7 @@ implementation
if not(target_info.system in systems_managed_vm) then if not(target_info.system in systems_managed_vm) then
loadtype('methodpointer',methodpointertype); loadtype('methodpointer',methodpointertype);
loadtype('HRESULT',hresultdef); loadtype('HRESULT',hresultdef);
{$ifdef cpu64bitaddr} set_default_int_types;
uinttype:=u64inttype;
sinttype:=s64inttype;
ptruinttype:=u64inttype;
ptrsinttype:=s64inttype;
{$endif cpu64bitaddr}
{$ifdef cpu32bit}
uinttype:=u32inttype;
sinttype:=s32inttype;
ptruinttype:=u32inttype;
ptrsinttype:=s32inttype;
{$endif cpu32bit}
{$ifdef cpu16bit}
uinttype:=u16inttype;
sinttype:=s16inttype;
ptruinttype:=u16inttype;
ptrsinttype:=s16inttype;
{$endif cpu16bit}
set_current_module(oldcurrentmodule); set_current_module(oldcurrentmodule);
end; end;