diff options
author | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-12-08 14:27:23 +0000 |
---|---|---|
committer | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-12-08 14:27:23 +0000 |
commit | 4db818fe2a837f40a30b6cf6e03aca696f899354 (patch) | |
tree | 4497dbe7186d7053814bba3bf3ea6ea51559d7a5 /compiler/utils | |
parent | d7684526e3ad009a974642d32c749a6154cf232f (diff) | |
download | fpc-4db818fe2a837f40a30b6cf6e03aca696f899354.tar.gz |
* save/restore the type (and hence code page) of ansistring constsyms in/from
the ppu (mantis #28964)
* also save/restore the type of constnil, constresourcestring and constguid
in/from the ppu
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@32617 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'compiler/utils')
-rw-r--r-- | compiler/utils/ppuutils/ppudump.pp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/compiler/utils/ppuutils/ppudump.pp b/compiler/utils/ppuutils/ppudump.pp index 84984db43f..12c03082d6 100644 --- a/compiler/utils/ppuutils/ppudump.pp +++ b/compiler/utils/ppuutils/ppudump.pp @@ -2395,7 +2395,9 @@ begin end; conststring, constresourcestring : - begin + begin + write ([space,' StringType : ']); + readderef('',constdef.TypeRef); len:=getlongint; getmem(pc,len+1); getdata(pc^,len); @@ -2465,7 +2467,8 @@ begin end; constnil: begin - writeln([space,' NIL pointer.']); + write([space,' NIL pointer :']); + readderef('',constdef.TypeRef); constdef.ConstType:=ctPtr; constdef.VInt:=0; end; @@ -2519,8 +2522,10 @@ begin end; constguid: begin + write ([space,' IntfType : ']); + readderef('',constdef.TypeRef); getdata(guid,sizeof(guid)); - write ([space,' IID String: {',hexstr(guid.d1,8),'-',hexstr(guid.d2,4),'-',hexstr(guid.d3,4),'-']); + write ([space,' IID String: {',hexstr(guid.d1,8),'-',hexstr(guid.d2,4),'-',hexstr(guid.d3,4),'-']); for i:=0 to 7 do begin write(hexstr(guid.d4[i],2)); |