On Wed, Jul 18, 2012 at 10:47 AM, Uros Bizjak <[email protected]> wrote: > On Wed, Jul 18, 2012 at 7:34 PM, Andrew Haley <[email protected]> wrote: >> On 07/18/2012 05:30 PM, H.J. Lu wrote: >>> 2012-07-16 H.J. Lu <[email protected]> >>> >>> 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.
I will check in this patch shortly. Thanks. -- H.J. --- 2012-07-18 H.J. Lu <[email protected]> PR libjava/53973 * include/x86_64-signal.h (CHECK_67H_PREFIX): Removed. (HANDLE_DIVIDE_OVERFLOW): Check and and skip 67h address size prefix unconditionally. diff --git a/libjava/include/x86_64-signal.h b/libjava/include/x86_64-signal.h index 84907c3..aa5a903 100644 --- a/libjava/include/x86_64-signal.h +++ b/libjava/include/x86_64-signal.h @@ -21,12 +21,6 @@ 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__))) @@ -53,8 +47,8 @@ do \ \ bool _is_64_bit = false; \ \ - /* Check and skip 67h address size prefix if needed. */ \ - if (CHECK_67H_PREFIX && _rip[0] == 0x67) \ + /* Check and skip 67h address size prefix. */ \ + if (_rip[0] == 0x67) \ _rip++; \ \
