Message ID | 20120718163007.GA23495@intel.com |
---|---|
State | New |
Headers | show |
On 07/18/2012 05:30 PM, H.J. Lu wrote: > 2012-07-16 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. OK. I would have thought it was OK to skip the 67h address size whether or not it was x32, though. Andrew.
On Wed, Jul 18, 2012 at 7:34 PM, Andrew Haley <aph@redhat.com> wrote: > On 07/18/2012 05:30 PM, H.J. Lu wrote: >> 2012-07-16 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. > > OK. I would have thought it was OK to skip the 67h address size > whether or not it was x32, though. You can just skip the prefix unconditionally. Uros.
diff --git a/libjava/include/x86_64-signal.h b/libjava/include/x86_64-signal.h index 4bd8a36..84907c3 100644 --- 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) \