Check and skip 67h address size prefix for x32

	PR libjava/53973
	* include/x86_64-signal.h (CHECK_67H_PREFIX): New.
	(HANDLE_DIVIDE_OVERFLOW): Check and and skip 67h address size
	prefix if CHECK_67H_PREFIX is 1.  Use ULL suffix for 64-bit
	integer.

From-SVN: r189621

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 152e9d7db08128091a859409f6efbff0badb3989..1d5570daed356bb6c3e8d75b2e29d390737c1a35 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2012-07-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR libjava/53973
+       * include/x86_64-signal.h (CHECK_67H_PREFIX): New.
+       (HANDLE_DIVIDE_OVERFLOW): Check and and skip 67h address size
+       prefix if CHECK_67H_PREFIX is 1.  Use ULL suffix for 64-bit
+       integer.
+
 2012-06-20  David Edelsohn  <dje.gcc@gmail.com>
            Alan Modra  <amodra@gmail.com>
 

diff --git a/libjava/include/x86_64-signal.h b/libjava/include/x86_64-signal.h
index 4bd8a360115e1b404027a5c57b69ffba674c8eb0..84907c3c3a399dfe300be2ebb8c920afc84feb0d 100644 (file)
--- a/libjava/include/x86_64-signal.h
+++ b/libjava/include/x86_64-signal.h
@@ -21,6 +21,12 @@ details.  */
 #define HANDLE_SEGV 1
 #define HANDLE_FPE 1
 
+#ifdef __ILP32__
+# define CHECK_67H_PREFIX 1
+#else
+# define CHECK_67H_PREFIX 0
+#endif
+
 #define SIGNAL_HANDLER(_name)                                  \
 static void _Jv_##_name (int, siginfo_t *,                     \
                         void *_p __attribute__ ((__unused__)))
@@ -47,6 +53,10 @@ do                                                                   \
                                                                        \
   bool _is_64_bit = false;                                             \
                                                                        \
+  /* Check and skip 67h address size prefix if needed.  */             \
+  if (CHECK_67H_PREFIX && _rip[0] == 0x67)                             \
+    _rip++;                                                            \
+                                                                       \
   if ((_rip[0] & 0xf0) == 0x40)  /* REX byte present.  */              \
     {                                                                  \
       unsigned char _rex = _rip[0] & 0x0f;                             \
@@ -64,10 +74,10 @@ do                                                                  \
        {                                                               \
          if (_is_64_bit)                                               \
            _min_value_dividend =                                       \
-             _gregs[REG_RAX] == (greg_t)0x8000000000000000UL;          \
+             _gregs[REG_RAX] == (greg_t)0x8000000000000000ULL;         \
          else                                                          \
            _min_value_dividend =                                       \
-             (_gregs[REG_RAX] & 0xffffffff) == (greg_t)0x80000000UL;   \
+             (_gregs[REG_RAX] & 0xffffffff) == (greg_t)0x80000000ULL;  \
        }                                                               \
                                                                        \
       if (_min_value_dividend)                                         \