OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

interpret.cc (STOREA): Rewrite using temporary variable to avoid double-macro expansion side-effects. 

* interpret.cc (STOREA): Rewrite using temporary variable to
        avoid double-macro expansion side-effects.
        (STOREI): Likewise.
        (STOREF): Likewise.
        (STOREL)[SIZEOF_VOID_P == 8]: Likewise.
        (STORED)[SIZEOF_VOID_P == 8]: Likewise.
        (STOREL)[SIZEOF_VOID_P != 8]: Likewise.
        (STORED)[SIZEOF_VOID_P != 8]: Likewise.
        (POKEI): Likewise.

From-SVN: r124746
This commit is contained in:
Keith Seitz 2007-05-15 21:35:28 +00:00 committed by Keith Seitz
parent 11c004e7f0
commit 98265f29a6
2 changed files with 77 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libjava/ChangeLog
View File

@ -1,3 +1,15 @@
2007-05-15 Keith Seitz <keiths@redhat.com>
* interpret.cc (STOREA): Rewrite using temporary variable to
avoid double-macro expansion side-effects.
(STOREI): Likewise.
(STOREF): Likewise.
(STOREL)[SIZEOF_VOID_P == 8]: Likewise.
(STORED)[SIZEOF_VOID_P == 8]: Likewise.
(STOREL)[SIZEOF_VOID_P != 8]: Likewise.
(STORED)[SIZEOF_VOID_P != 8]: Likewise.
(POKEI): Likewise.
2007-05-12 David Daney <ddaney@avtrex.com>
PR libgcj/29324

109
libjava/interpret.cc
View File

@ -180,60 +180,81 @@ convert (FROM val, TO min, TO max)
# define LOADD(I) LOADL(I)
#endif
#define STOREA(I) \
do { \
DEBUG_LOCALS_INSN (I, 'o'); \
locals[I].o = (--sp)->o; \
} while (0)
#define STOREI(I) \
do { \
DEBUG_LOCALS_INSN (I, 'i'); \
locals[I].i = (--sp)->i; \
} while (0)
#define STOREF(I) \
do { \
DEBUG_LOCALS_INSN (I, 'f'); \
locals[I].f = (--sp)->f; \
#define STOREA(I) \
do \
{ \
jint __idx = (I); \
DEBUG_LOCALS_INSN (__idx, 'o'); \
locals[__idx].o = (--sp)->o; \
} \
while (0)
#define STOREI(I) \
do \
{ \
jint __idx = (I); \
DEBUG_LOCALS_INSN (__idx, 'i'); \
locals[__idx].i = (--sp)->i; \
} while (0)
#define STOREF(I) \
do \
{ \
jint __idx = (I); \
DEBUG_LOCALS_INSN (__idx, 'f'); \
locals[__idx].f = (--sp)->f; \
} \
while (0)
#if SIZEOF_VOID_P == 8
# define STOREL(I) \
do { \
DEBUG_LOCALS_INSN (I, 'l'); \
DEBUG_LOCALS_INSN (I + 1, 'x'); \
(sp -= 2, locals[I].l = sp->l); \
} while (0)
# define STORED(I) \
do { \
DEBUG_LOCALS_INSN (I, 'd'); \
DEBUG_LOCALS_INSN (I + 1, 'x'); \
(sp -= 2, locals[I].d = sp->d); \
} while (0)
# define STOREL(I) \
do \
{ \
jint __idx = (I); \
DEBUG_LOCALS_INSN (__idx, 'l'); \
DEBUG_LOCALS_INSN (__idx + 1, 'x'); \
(sp -= 2, locals[__idx].l = sp->l); \
} \
while (0)
# define STORED(I) \
do \
{ \
jint __idx = (I); \
DEBUG_LOCALS_INSN (__idx, 'd'); \
DEBUG_LOCALS_INSN (__idx + 1, 'x'); \
(sp -= 2, locals[__idx].d = sp->d); \
} \
while (0)
#else
# define STOREL(I) \
do { \
DEBUG_LOCALS_INSN (I, 'l'); \
DEBUG_LOCALS_INSN (I + 1, 'x'); \
jint __idx = (I); \
locals[__idx+1].ia[0] = (--sp)->ia[0]; \
locals[__idx].ia[0] = (--sp)->ia[0]; \
} while (0)
# define STORED(I) \
do { \
DEBUG_LOCALS_INSN (I, 'd'); \
DEBUG_LOCALS_INSN (I + 1, 'x'); \
jint __idx = (I); \
locals[__idx+1].ia[0] = (--sp)->ia[0]; \
locals[__idx].ia[0] = (--sp)->ia[0]; \
# define STOREL(I) \
do \
{ \
jint __idx = (I); \
DEBUG_LOCALS_INSN (__idx, 'l'); \
DEBUG_LOCALS_INSN (__idx + 1, 'x'); \
locals[__idx + 1].ia[0] = (--sp)->ia[0]; \
locals[__idx].ia[0] = (--sp)->ia[0]; \
} \
while (0)
# define STORED(I) \
do { \
jint __idx = (I); \
DEBUG_LOCALS_INSN (__idx, 'd'); \
DEBUG_LOCALS_INSN (__idx + 1, 'x'); \
locals[__idx + 1].ia[0] = (--sp)->ia[0]; \
locals[__idx].ia[0] = (--sp)->ia[0]; \
} while (0)
#endif
#define PEEKI(I) (locals+(I))->i
#define PEEKA(I) (locals+(I))->o
#define POKEI(I,V) \
DEBUG_LOCALS_INSN(I,'i'); \
((locals+(I))->i = (V))
#define POKEI(I,V) \
do \
{ \
jint __idx = (I); \
DEBUG_LOCALS_INSN (__idx, 'i'); \
((locals + __idx)->i = (V)); \
} \
while (0)
#define BINOPI(OP) { \