FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

natThrowable.cc (printRawStackTrace): Copy the stackTrace buffer to a correctly aligned pointer array.

Browse source 
2001-03-01  Andrew Haley  <aph@redhat.com>

        * java/lang/natThrowable.cc (printRawStackTrace): Copy the
        stackTrace buffer to a correctly aligned pointer array.

From-SVN: r40456
This commit is contained in:
Andrew Haley 2001-03-14 15:49:06 +00:00 • committed by Andrew Haley
parent 1a06f5fe3f
commit a58dc194c8
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libjava/ChangeLog
View file

@ -1,3 +1,8 @@
2001-03-01 Andrew Haley <aph@redhat.com>
* java/lang/natThrowable.cc (printRawStackTrace): Copy the
stackTrace buffer to a correctly aligned pointer array.
2001-03-12 Bryce McKinlay <bryce@albatross.co.nz> 2001-03-12 Bryce McKinlay <bryce@albatross.co.nz>
* java/lang/Runtime.java (_exit): Declare new package-private native. * java/lang/Runtime.java (_exit): Declare new package-private native.

7
libjava/java/lang/natThrowable.cc
View file

@ -65,7 +65,7 @@ java::lang::Throwable::fillInStackTrace (void)
if (n > 0) if (n > 0)
{ {
// ??? Might this cause a problem if the byte array isn't aligned? // We copy the array below to deal with alignment issues.
stackTrace = JvNewByteArray (n * sizeof p[0]); stackTrace = JvNewByteArray (n * sizeof p[0]);
memcpy (elements (stackTrace), p+1, (n * sizeof p[0])); memcpy (elements (stackTrace), p+1, (n * sizeof p[0]));
} }
@ -83,8 +83,9 @@ java::lang::Throwable::printRawStackTrace (java::io::PrintWriter *wr)
if (!stackTrace) if (!stackTrace)
return; return;
void **p = (void **)elements (stackTrace); int depth = stackTrace->length / sizeof (void *);
int depth = stackTrace->length / sizeof p[0]; void *p[depth];
memcpy (p, elements (stackTrace), sizeof p);
_Jv_name_finder finder (_Jv_ThisExecutable ()); _Jv_name_finder finder (_Jv_ThisExecutable ());