interpret.cc (_Jv_InterpMethod::run): Don't use libffi types, they were meant to...

2003-10-14  Paolo Bonzini  <bonzini@gnu.org>

	* interpret.cc (_Jv_InterpMethod::run): Don't
	use libffi types, they were meant to be internal.
	* gcj/javaprims.h (_Jv_ulong): New typedef.

From-SVN: r72482

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c3ceb5c13ecf684a361b1a8a13eed16f9f8d02e9..2e33fe98954a1931647d821bbdb84d07b79ab274 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-14  Paolo Bonzini  <bonzini@gnu.org>
+
+       * interpret.cc (_Jv_InterpMethod::run): Don't
+       use libffi types, they were meant to be internal.
+       * gcj/javaprims.h (_Jv_ulong): New typedef.
+
 2003-10-13  Tom Tromey  <tromey@redhat.com>
 
        * java/lang/natClassLoader.cc (_Jv_InitNewClassFields): Removed.

diff --git a/libjava/gcj/javaprims.h b/libjava/gcj/javaprims.h
index b88b3fe3e71b11389e7bd805921422e360fb6630..4420f64ff7231894e3e6e21fa7e0857c3e4410cf 100644 (file)
--- a/libjava/gcj/javaprims.h
+++ b/libjava/gcj/javaprims.h
@@ -496,6 +496,7 @@ extern "C" void _Jv_RegisterClassHookDefault (jclass);
 
 typedef unsigned short _Jv_ushort __attribute__((__mode__(__HI__)));
 typedef unsigned int _Jv_uint __attribute__((__mode__(__SI__)));
+typedef unsigned int _Jv_ulong __attribute__((__mode__(__DI__)));
 
 struct _Jv_Utf8Const
 {

diff --git a/libjava/interpret.cc b/libjava/interpret.cc
index 43d627921fb808eb7a9c05e179b446a024bbd5ec..5fd2c2b5869fb2b1fb7f0d7e3ea45daebe811146 100644 (file)
--- a/libjava/interpret.cc
+++ b/libjava/interpret.cc
@@ -1898,7 +1898,7 @@ _Jv_InterpMethod::run (void *retp, ffi_raw *args)
     insn_iushr:
       {
        jint shift = (POPI() & 0x1f);
-       UINT32 value = (UINT32) POPI();
+       _Jv_uint value = (_Jv_uint) POPI();
        PUSHI ((jint) (value >> shift));
       }
       NEXT_INSN;
@@ -1906,8 +1906,8 @@ _Jv_InterpMethod::run (void *retp, ffi_raw *args)
     insn_lushr:
       {
        jint shift = (POPI() & 0x3f);
-       UINT64 value = (UINT64) POPL();
-       PUSHL ((value >> shift));
+       _Jv_ulong value = (_Jv_ulong) POPL();
+       PUSHL ((jlong) (value >> shift));
       }
       NEXT_INSN;