paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-05 21:09:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

* don't keep the original location in case of 2->4 byte ordinal type

Browse Source 
conversions because the sign may not be correct in case the value comes
    from Java code

git-svn-id: branches/jvmbackend@18654 -
This commit is contained in:
Jonas Maebe 2011-08-20 08:21:39 +00:00
parent 40fdc62e74
commit 67ce687683
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/jvm/njvmcnv.pas
View File

@ -256,8 +256,8 @@ implementation
begin
location_copy(location,left.location);
{ reuse a loc_reference when the newsize is larger than
than the original, because all <= 4 byte loads will result in
a stack slot that occupies 4 bytes.
than the original and 4 bytes, because all <= 4 byte loads will
result in a stack slot that occupies 4 bytes.
Except
a) for arrays (they use different load instructions for
@ -269,15 +269,7 @@ implementation
not assigned(location.reference.symbol) and
(location.reference.arrayreftype=art_none) and
(ressize>leftsize) and
((ressize=4) or
{ this will kill any sign/zero-extension after the load, so
in case the result is 2 bytes (and source is 1 bytes), the
source must be unsigned (-> already zero-extended in memory),
or the destination must be signed (sign-extension in memory
can be loaded onto the stack without problems) }
((ressize=2) and
(not is_signed(left.resultdef) or
is_signed(resultdef)))) then
(ressize=4) then
begin
location.size:=def_cgsize(resultdef);
{ no adjustment of the offset even though Java is big endian,