diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-02-08 00:17:28 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-02-08 00:17:28 +0000 |
| commit | c820df039438d254f1395065d4b093195766f9a6 (patch) | |
| tree | de68371f9c537b61b619d68908d738d8af4c2a5c /libjava | |
| parent | 844c4b9dfa5755b10de2a1f5abf9f35b8d33faa1 (diff) | |
| download | ppe42-gcc-c820df039438d254f1395065d4b093195766f9a6.tar.gz ppe42-gcc-c820df039438d254f1395065d4b093195766f9a6.zip | |
* interpret.cc (PUSHL): Don't use expression statement.
(PUSHD): Likewise.
(LOADL): Likewise.
(STOREL): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@31844 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/interpret.cc | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d3078fa8fc8..d56c85cc121 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2000-02-07 Tom Tromey <tromey@cygnus.com> + * interpret.cc (PUSHL): Don't use expression statement. + (PUSHD): Likewise. + (LOADL): Likewise. + (STOREL): Likewise. + * jni.cc (add_char): Conditional on INTERPRETER. (mangled_name): Likewise. (call): Likewise. diff --git a/libjava/interpret.cc b/libjava/interpret.cc index c278758150c..6964f5d6ef8 100644 --- a/libjava/interpret.cc +++ b/libjava/interpret.cc @@ -87,12 +87,12 @@ static inline void dupx (_Jv_word *sp, int n, int x) #define PUSHA(V) (sp++)->o = (V) #define PUSHI(V) (sp++)->i = (V) #define PUSHF(V) (sp++)->f = (V) -#define PUSHL(V) ({ _Jv_word2 w2; w2.l=(V); \ +#define PUSHL(V) do { _Jv_word2 w2; w2.l=(V); \ (sp++)->ia[0] = w2.ia[0]; \ - (sp++)->ia[0] = w2.ia[1]; }) -#define PUSHD(V) ({ _Jv_word2 w2; w2.d=(V); \ + (sp++)->ia[0] = w2.ia[1]; } while (0) +#define PUSHD(V) do { _Jv_word2 w2; w2.d=(V); \ (sp++)->ia[0] = w2.ia[0]; \ - (sp++)->ia[0] = w2.ia[1]; }) + (sp++)->ia[0] = w2.ia[1]; } while (0) #define POPA() ((--sp)->o) #define POPI() ((jint) (--sp)->i) // cast since it may be promoted @@ -107,20 +107,20 @@ static inline void dupx (_Jv_word *sp, int n, int x) #define LOADA(I) (sp++)->o = locals[I].o #define LOADI(I) (sp++)->i = locals[I].i #define LOADF(I) (sp++)->f = locals[I].f -#define LOADL(I) ({ jint __idx = (I); \ +#define LOADL(I) do { jint __idx = (I); \ (sp++)->ia[0] = locals[__idx].ia[0]; \ (sp++)->ia[0] = locals[__idx+1].ia[0]; \ - }) + } while (0) #define LOADD(I) LOADL(I) #define STOREA(I) locals[I].o = (--sp)->o #define STOREI(I) locals[I].i = (--sp)->i #define STOREF(I) locals[I].f = (--sp)->f -#define STOREL(I) ({ jint __idx = (I); \ +#define STOREL(I) do { jint __idx = (I); \ locals[__idx+1].ia[0] = (--sp)->ia[0]; \ locals[__idx].ia[0] = (--sp)->ia[0]; \ - }) + } while (0) #define STORED(I) STOREL(I) #define PEEKI(I) (locals+(I))->i |
