Commit e4f92767 by H.J. Lu Committed by H.J. Lu

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
parent 9df3cfea
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> 2012-06-20 David Edelsohn <dje.gcc@gmail.com>
Alan Modra <amodra@gmail.com> Alan Modra <amodra@gmail.com>
......
...@@ -21,6 +21,12 @@ details. */ ...@@ -21,6 +21,12 @@ details. */
#define HANDLE_SEGV 1 #define HANDLE_SEGV 1
#define HANDLE_FPE 1 #define HANDLE_FPE 1
#ifdef __ILP32__
# define CHECK_67H_PREFIX 1
#else
# define CHECK_67H_PREFIX 0
#endif
#define SIGNAL_HANDLER(_name) \ #define SIGNAL_HANDLER(_name) \
static void _Jv_##_name (int, siginfo_t *, \ static void _Jv_##_name (int, siginfo_t *, \
void *_p __attribute__ ((__unused__))) void *_p __attribute__ ((__unused__)))
...@@ -47,6 +53,10 @@ do \ ...@@ -47,6 +53,10 @@ do \
\ \
bool _is_64_bit = false; \ 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. */ \ if ((_rip[0] & 0xf0) == 0x40) /* REX byte present. */ \
{ \ { \
unsigned char _rex = _rip[0] & 0x0f; \ unsigned char _rex = _rip[0] & 0x0f; \
...@@ -64,10 +74,10 @@ do \ ...@@ -64,10 +74,10 @@ do \
{ \ { \
if (_is_64_bit) \ if (_is_64_bit) \
_min_value_dividend = \ _min_value_dividend = \
_gregs[REG_RAX] == (greg_t)0x8000000000000000UL; \ _gregs[REG_RAX] == (greg_t)0x8000000000000000ULL; \
else \ else \
_min_value_dividend = \ _min_value_dividend = \
(_gregs[REG_RAX] & 0xffffffff) == (greg_t)0x80000000UL; \ (_gregs[REG_RAX] & 0xffffffff) == (greg_t)0x80000000ULL; \
} \ } \
\ \
if (_min_value_dividend) \ if (_min_value_dividend) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment