summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
5869bfd)
(STOREA): Reformat.
(STOREI): Likewise.
(STOREF): Likewise.
(STOREL): Likewise.
(STORED): Likewise.
(POKEI): Likewise.
(run_normal_debug): Likewise.
(run_synch_object_debug): Likewise.
(run_class_debug): Likewise.
(run_synch_class_debug): Likewise.
(get1s): Likewise.
(get1u): Likewise.
(get2u): Likewise.
(get4): Likewise.
(NULLARRAYCHECK): Likewise.
(ARRAYBOUNDSCHECK): Likewise.
* interpret-run.cc (insn_target) <breakpoint>: Tidy.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121313
138bc75d-0d04-0410-961f-
82ee72b054a4
2007-01-29 Tom Tromey <tromey@redhat.com>
2007-01-29 Tom Tromey <tromey@redhat.com>
+ * interpret.cc (run_debug): Remove comment.
+ (STOREA): Reformat.
+ (STOREI): Likewise.
+ (STOREF): Likewise.
+ (STOREL): Likewise.
+ (STORED): Likewise.
+ (POKEI): Likewise.
+ (run_normal_debug): Likewise.
+ (run_synch_object_debug): Likewise.
+ (run_class_debug): Likewise.
+ (run_synch_class_debug): Likewise.
+ (get1s): Likewise.
+ (get1u): Likewise.
+ (get2u): Likewise.
+ (get4): Likewise.
+ (NULLARRAYCHECK): Likewise.
+ (ARRAYBOUNDSCHECK): Likewise.
+ * interpret-run.cc (insn_target) <breakpoint>: Tidy.
+
+2007-01-29 Tom Tromey <tromey@redhat.com>
+
* configure, Makefile.in: Rebuilt.
* Makefile.am (bin_SCRIPTS): Never install scripts/jar.
* configure.ac (BASH_JAR): Removed conditional.
* configure, Makefile.in: Rebuilt.
* Makefile.am (bin_SCRIPTS): Never install scripts/jar.
* configure.ac (BASH_JAR): Removed conditional.
INSN_LABEL(invokespecial),
INSN_LABEL(invokestatic),
INSN_LABEL(invokeinterface),
INSN_LABEL(invokespecial),
INSN_LABEL(invokestatic),
INSN_LABEL(invokeinterface),
- INSN_LABEL (breakpoint),
+ INSN_LABEL(breakpoint),
INSN_LABEL(new),
INSN_LABEL(newarray),
INSN_LABEL(anewarray),
INSN_LABEL(new),
INSN_LABEL(newarray),
INSN_LABEL(anewarray),
# define LOADD(I) LOADL(I)
#endif
# 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; \
-} while(0)
+#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; \
+ } while (0)
-# define STOREL(I) \
-do { \
-DEBUG_LOCALS_INSN (I, 'l'); \
-(sp -= 2, locals[I].l = sp->l); \
-} while(0)
+# define STOREL(I) \
+ do { \
+ DEBUG_LOCALS_INSN (I, 'l'); \
+ (sp -= 2, locals[I].l = sp->l); \
+ } while (0)
-do { \
-DEBUG_LOCALS_INSN (I, 'd'); \
-(sp -= 2, locals[I].d = sp->d); \
-} while(0)
+ do { \
+ DEBUG_LOCALS_INSN (I, 'd'); \
+ (sp -= 2, locals[I].d = sp->d); \
+ } while (0)
-# define STOREL(I) \
-do { DEBUG_LOCALS_INSN(I, 'l'); \
- 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'); \
- jint __idx = (I); \
- locals[__idx+1].ia[0] = (--sp)->ia[0]; \
- locals[__idx].ia[0] = (--sp)->ia[0]; \
- } while (0)
+# define STOREL(I) \
+ do { \
+ DEBUG_LOCALS_INSN (I, 'l'); \
+ 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'); \
+ jint __idx = (I); \
+ 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
#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) \
+ DEBUG_LOCALS_INSN(I,'i'); \
+ ((locals+(I))->i = (V))
PUSHD(value1 OP value2); \
}
PUSHD(value1 OP value2); \
}
-static inline jint get1s(unsigned char* loc) {
+static inline jint
+get1s (unsigned char* loc)
+{
return *(signed char*)loc;
}
return *(signed char*)loc;
}
-static inline jint get1u(unsigned char* loc) {
+static inline jint
+get1u (unsigned char* loc)
+{
-static inline jint get2s(unsigned char* loc) {
+static inline jint
+get2s(unsigned char* loc)
+{
return (((jint)*(signed char*)loc) << 8) | ((jint)*(loc+1));
}
return (((jint)*(signed char*)loc) << 8) | ((jint)*(loc+1));
}
-static inline jint get2u(unsigned char* loc) {
+static inline jint
+get2u (unsigned char* loc)
+{
return (((jint)(*loc)) << 8) | ((jint)*(loc+1));
}
return (((jint)(*loc)) << 8) | ((jint)*(loc+1));
}
-static jint get4(unsigned char* loc) {
+static jint
+get4 (unsigned char* loc)
+{
return (((jint)(loc[0])) << 24)
| (((jint)(loc[1])) << 16)
| (((jint)(loc[2])) << 8)
return (((jint)(loc[0])) << 24)
| (((jint)(loc[1])) << 16)
| (((jint)(loc[2])) << 8)
#ifdef HANDLE_SEGV
#define NULLARRAYCHECK(X) SAVE_PC()
#else
#ifdef HANDLE_SEGV
#define NULLARRAYCHECK(X) SAVE_PC()
#else
-#define NULLARRAYCHECK(X) \
- do { SAVE_PC(); if ((X)==NULL) { throw_null_pointer_exception (); } } while (0)
+#define NULLARRAYCHECK(X) \
+ do \
+ { \
+ SAVE_PC(); \
+ if ((X) == NULL) { throw_null_pointer_exception (); } \
+ } while (0)
-#define ARRAYBOUNDSCHECK(array, index) \
- do \
- { \
- if (((unsigned) index) >= (unsigned) (array->length)) \
- _Jv_ThrowBadArrayIndex (index); \
- } \
- while (0)
+#define ARRAYBOUNDSCHECK(array, index) \
+ do \
+ { \
+ if (((unsigned) index) >= (unsigned) (array->length)) \
+ _Jv_ThrowBadArrayIndex (index); \
+ } while (0)
void
_Jv_InterpMethod::run_normal (ffi_cif *,
void
_Jv_InterpMethod::run_normal (ffi_cif *,
- void* ret,
- ffi_raw * args,
- void* __this)
+ void *ret,
+ ffi_raw *args,
+ void *__this)
{
_Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
run (ret, args, _this);
{
_Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
run (ret, args, _this);
void
_Jv_InterpMethod::run_normal_debug (ffi_cif *,
void
_Jv_InterpMethod::run_normal_debug (ffi_cif *,
- void* ret,
- ffi_raw * args,
- void* __this)
+ void *ret,
+ ffi_raw *args,
+ void *__this)
{
_Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
run_debug (ret, args, _this);
{
_Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
run_debug (ret, args, _this);
void
_Jv_InterpMethod::run_synch_object (ffi_cif *,
void
_Jv_InterpMethod::run_synch_object (ffi_cif *,
- void* ret,
- ffi_raw * args,
- void* __this)
+ void *ret,
+ ffi_raw *args,
+ void *__this)
{
_Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
{
_Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
void
_Jv_InterpMethod::run_synch_object_debug (ffi_cif *,
void
_Jv_InterpMethod::run_synch_object_debug (ffi_cif *,
- void* ret,
- ffi_raw * args,
- void* __this)
+ void *ret,
+ ffi_raw *args,
+ void *__this)
{
_Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
{
_Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
void
_Jv_InterpMethod::run_class (ffi_cif *,
void
_Jv_InterpMethod::run_class (ffi_cif *,
- void* ret,
- ffi_raw * args,
- void* __this)
+ void *ret,
+ ffi_raw *args,
+ void *__this)
{
_Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
_Jv_InitClass (_this->defining_class);
{
_Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
_Jv_InitClass (_this->defining_class);
void
_Jv_InterpMethod::run_class_debug (ffi_cif *,
void
_Jv_InterpMethod::run_class_debug (ffi_cif *,
- void* ret,
- ffi_raw * args,
- void* __this)
+ void *ret,
+ ffi_raw *args,
+ void *__this)
{
_Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
_Jv_InitClass (_this->defining_class);
{
_Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
_Jv_InitClass (_this->defining_class);
void
_Jv_InterpMethod::run_synch_class (ffi_cif *,
void
_Jv_InterpMethod::run_synch_class (ffi_cif *,
- void* ret,
- ffi_raw * args,
- void* __this)
+ void *ret,
+ ffi_raw *args,
+ void *__this)
{
_Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
{
_Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
void
_Jv_InterpMethod::run_synch_class_debug (ffi_cif *,
void
_Jv_InterpMethod::run_synch_class_debug (ffi_cif *,
- void* ret,
- ffi_raw * args,
- void* __this)
+ void *ret,
+ ffi_raw *args,
+ void *__this)
{
_Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
{
_Jv_InterpMethod *_this = (_Jv_InterpMethod *) __this;
void
_Jv_InterpMethod::run_debug (void *retp, ffi_raw *args, _Jv_InterpMethod *meth)
{
void
_Jv_InterpMethod::run_debug (void *retp, ffi_raw *args, _Jv_InterpMethod *meth)
{
-/* Used to keep track of local variable type
- *
- * Possible Types:
- * o object
- * i integer
- * f float
- * l long
- * d double
- */
#define DEBUG
#undef DEBUG_LOCALS_INSN
#define DEBUG_LOCALS_INSN(s, t) do {} while(0)
#define DEBUG
#undef DEBUG_LOCALS_INSN
#define DEBUG_LOCALS_INSN(s, t) do {} while(0)