Skip to content

R
riscv-gcc-1
Commit cec71868 by Chris Sears Committed by Tom Tromey
Options

interpret.cc (NULLARRAYCHECK): New macro. 

2002-01-11  Chris Sears  <cbsears_sf@yahoo.com>

	* interpret.cc (NULLARRAYCHECK): New macro.
	(SAVE_PC): Just store `pc'.
	(find_exception): Subtract one from `pc' here.
	(continue1) [insn_iaload, insn_laload, insn_faload, insn_daload,
	insn_aaload, insn_baload, insn_caload, insn_saload, insn_iastore,
	insn_lastore, insn_fastore, insn_dastore, insn_aastore,
	insn_bastore, insn_castore, insn_sastore]: Use NULLARRAYCHECK, and
	don't call SAVE_PC.
	(continue1) [insn_fdiv, insn_ddiv, insn_frem, insn_drem]: Don't
	call SAVE_PC.

From-SVN: r48787
parent 0b0d4c5b
Showing with 38 additions and 41 deletions
libjava/ChangeLog
2002-01-11 Chris Sears <cbsears_sf@yahoo.com>
* interpret.cc (NULLARRAYCHECK): New macro.
(SAVE_PC): Just store `pc'.
(find_exception): Subtract one from `pc' here.
(continue1) [insn_iaload, insn_laload, insn_faload, insn_daload,
insn_aaload, insn_baload, insn_caload, insn_saload, insn_iastore,
insn_lastore, insn_fastore, insn_dastore, insn_aastore,
insn_bastore, insn_castore, insn_sastore]: Use NULLARRAYCHECK, and
don't call SAVE_PC.
(continue1) [insn_fdiv, insn_ddiv, insn_frem, insn_drem]: Don't
call SAVE_PC.
2002-01-11 Tom Tromey <tromey@redhat.com> 2002-01-11 Tom Tromey <tromey@redhat.com>
* java/lang/natSystem.cc (init_properties): Only look for default * java/lang/natSystem.cc (init_properties): Only look for default
......
libjava/interpret.cc
...@@ -182,9 +182,12 @@ static jint get4(unsigned char* loc) { ...@@ -182,9 +182,12 @@ static jint get4(unsigned char* loc) {
#ifdef HANDLE_SEGV #ifdef HANDLE_SEGV
#define NULLCHECK(X) #define NULLCHECK(X)
#define NULLARRAYCHECK(X) do { SAVE_PC; } while (0)
#else #else
#define NULLCHECK(X) \ #define NULLCHECK(X) \
do { if ((X)==NULL) throw_null_pointer_exception (); } while (0) do { if ((X)==NULL) throw_null_pointer_exception (); } while (0)
#define NULLARRAYCHECK(X) \
do { if ((X)==NULL) { SAVE_PC; throw_null_pointer_exception (); } } while (0)
#endif #endif
#define ARRAYBOUNDSCHECK(array, index) \ #define ARRAYBOUNDSCHECK(array, index) \
...@@ -298,10 +301,14 @@ _Jv_InterpMethod::run (ffi_cif* cif, ...@@ -298,10 +301,14 @@ _Jv_InterpMethod::run (ffi_cif* cif,
return ex; return ex;
} }
#define SAVE_PC inv->pc = pc
bool _Jv_InterpMethod::find_exception (jobject ex, bool _Jv_InterpMethod::find_exception (jobject ex,
_Jv_InterpMethodInvocation *inv) _Jv_InterpMethodInvocation *inv)
{ {
int logical_pc = inv->pc - bytecode (); // We subtract one because the PC was incremented before it was
// saved.
int logical_pc = inv->pc - 1 - bytecode ();
_Jv_InterpException *exc = exceptions (); _Jv_InterpException *exc = exceptions ();
jclass exc_class = ex->getClass (); jclass exc_class = ex->getClass ();
...@@ -622,8 +629,6 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv) ...@@ -622,8 +629,6 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
INSN_LABEL(jsr_w), INSN_LABEL(jsr_w),
}; };
#define SAVE_PC inv->pc = pc-1
/* If the macro INLINE_SWITCH is not defined, then the main loop /* If the macro INLINE_SWITCH is not defined, then the main loop
operates as one big (normal) switch statement. If it is defined, operates as one big (normal) switch statement. If it is defined,
then the case selection is performed `inline' in the end of the then the case selection is performed `inline' in the end of the
...@@ -960,88 +965,80 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv) ...@@ -960,88 +965,80 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
NEXT_INSN; NEXT_INSN;
insn_iaload: insn_iaload:
SAVE_PC;
{ {
jint index = POPI(); jint index = POPI();
jintArray arr = (jintArray) POPA(); jintArray arr = (jintArray) POPA();
NULLCHECK (arr); NULLARRAYCHECK (arr);
ARRAYBOUNDSCHECK (arr, index); ARRAYBOUNDSCHECK (arr, index);
PUSHI( elements(arr)[index] ); PUSHI( elements(arr)[index] );
} }
NEXT_INSN; NEXT_INSN;
insn_laload: insn_laload:
SAVE_PC;
{ {
jint index = POPI(); jint index = POPI();
jlongArray arr = (jlongArray) POPA(); jlongArray arr = (jlongArray) POPA();
NULLCHECK (arr); NULLARRAYCHECK (arr);
ARRAYBOUNDSCHECK (arr, index); ARRAYBOUNDSCHECK (arr, index);
PUSHL( elements(arr)[index] ); PUSHL( elements(arr)[index] );
} }
NEXT_INSN; NEXT_INSN;
insn_faload: insn_faload:
SAVE_PC;
{ {
jint index = POPI(); jint index = POPI();
jfloatArray arr = (jfloatArray) POPA(); jfloatArray arr = (jfloatArray) POPA();
NULLCHECK (arr); NULLARRAYCHECK (arr);
ARRAYBOUNDSCHECK (arr, index); ARRAYBOUNDSCHECK (arr, index);
PUSHF( elements(arr)[index] ); PUSHF( elements(arr)[index] );
} }
NEXT_INSN; NEXT_INSN;
insn_daload: insn_daload:
SAVE_PC;
{ {
jint index = POPI(); jint index = POPI();
jdoubleArray arr = (jdoubleArray) POPA(); jdoubleArray arr = (jdoubleArray) POPA();
NULLCHECK (arr); NULLARRAYCHECK (arr);
ARRAYBOUNDSCHECK (arr, index); ARRAYBOUNDSCHECK (arr, index);
PUSHD( elements(arr)[index] ); PUSHD( elements(arr)[index] );
} }
NEXT_INSN; NEXT_INSN;
insn_aaload: insn_aaload:
SAVE_PC;
{ {
jint index = POPI(); jint index = POPI();
jobjectArray arr = (jobjectArray) POPA(); jobjectArray arr = (jobjectArray) POPA();
NULLCHECK (arr); NULLARRAYCHECK (arr);
ARRAYBOUNDSCHECK (arr, index); ARRAYBOUNDSCHECK (arr, index);
PUSHA( elements(arr)[index] ); PUSHA( elements(arr)[index] );
} }
NEXT_INSN; NEXT_INSN;
insn_baload: insn_baload:
SAVE_PC;
{ {
jint index = POPI(); jint index = POPI();
jbyteArray arr = (jbyteArray) POPA(); jbyteArray arr = (jbyteArray) POPA();
NULLCHECK (arr); NULLARRAYCHECK (arr);
ARRAYBOUNDSCHECK (arr, index); ARRAYBOUNDSCHECK (arr, index);
PUSHI( elements(arr)[index] ); PUSHI( elements(arr)[index] );
} }
NEXT_INSN; NEXT_INSN;
insn_caload: insn_caload:
SAVE_PC;
{ {
jint index = POPI(); jint index = POPI();
jcharArray arr = (jcharArray) POPA(); jcharArray arr = (jcharArray) POPA();
NULLCHECK (arr); NULLARRAYCHECK (arr);
ARRAYBOUNDSCHECK (arr, index); ARRAYBOUNDSCHECK (arr, index);
PUSHI( elements(arr)[index] ); PUSHI( elements(arr)[index] );
} }
NEXT_INSN; NEXT_INSN;
insn_saload: insn_saload:
SAVE_PC;
{ {
jint index = POPI(); jint index = POPI();
jshortArray arr = (jshortArray) POPA(); jshortArray arr = (jshortArray) POPA();
NULLCHECK (arr); NULLARRAYCHECK (arr);
ARRAYBOUNDSCHECK (arr, index); ARRAYBOUNDSCHECK (arr, index);
PUSHI( elements(arr)[index] ); PUSHI( elements(arr)[index] );
} }
...@@ -1148,60 +1145,55 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv) ...@@ -1148,60 +1145,55 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
NEXT_INSN; NEXT_INSN;
insn_iastore: insn_iastore:
SAVE_PC;
{ {
jint value = POPI(); jint value = POPI();
jint index = POPI(); jint index = POPI();
jintArray arr = (jintArray) POPA(); jintArray arr = (jintArray) POPA();
NULLCHECK (arr); NULLARRAYCHECK (arr);
ARRAYBOUNDSCHECK (arr, index); ARRAYBOUNDSCHECK (arr, index);
elements(arr)[index] = value; elements(arr)[index] = value;
} }
NEXT_INSN; NEXT_INSN;
insn_lastore: insn_lastore:
SAVE_PC;
{ {
jlong value = POPL(); jlong value = POPL();
jint index = POPI(); jint index = POPI();
jlongArray arr = (jlongArray) POPA(); jlongArray arr = (jlongArray) POPA();
NULLCHECK (arr); NULLARRAYCHECK (arr);
ARRAYBOUNDSCHECK (arr, index); ARRAYBOUNDSCHECK (arr, index);
elements(arr)[index] = value; elements(arr)[index] = value;
} }
NEXT_INSN; NEXT_INSN;
insn_fastore: insn_fastore:
SAVE_PC;
{ {
jfloat value = POPF(); jfloat value = POPF();
jint index = POPI(); jint index = POPI();
jfloatArray arr = (jfloatArray) POPA(); jfloatArray arr = (jfloatArray) POPA();
NULLCHECK (arr); NULLARRAYCHECK (arr);
ARRAYBOUNDSCHECK (arr, index); ARRAYBOUNDSCHECK (arr, index);
elements(arr)[index] = value; elements(arr)[index] = value;
} }
NEXT_INSN; NEXT_INSN;
insn_dastore: insn_dastore:
SAVE_PC;
{ {
jdouble value = POPD(); jdouble value = POPD();
jint index = POPI(); jint index = POPI();
jdoubleArray arr = (jdoubleArray) POPA(); jdoubleArray arr = (jdoubleArray) POPA();
NULLCHECK (arr); NULLARRAYCHECK (arr);
ARRAYBOUNDSCHECK (arr, index); ARRAYBOUNDSCHECK (arr, index);
elements(arr)[index] = value; elements(arr)[index] = value;
} }
NEXT_INSN; NEXT_INSN;
insn_aastore: insn_aastore:
SAVE_PC;
{ {
jobject value = POPA(); jobject value = POPA();
jint index = POPI(); jint index = POPI();
jobjectArray arr = (jobjectArray) POPA(); jobjectArray arr = (jobjectArray) POPA();
NULLCHECK (arr); NULLARRAYCHECK (arr);
ARRAYBOUNDSCHECK (arr, index); ARRAYBOUNDSCHECK (arr, index);
_Jv_CheckArrayStore (arr, value); _Jv_CheckArrayStore (arr, value);
elements(arr)[index] = value; elements(arr)[index] = value;
...@@ -1209,36 +1201,33 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv) ...@@ -1209,36 +1201,33 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
NEXT_INSN; NEXT_INSN;
insn_bastore: insn_bastore:
SAVE_PC;
{ {
jbyte value = (jbyte) POPI(); jbyte value = (jbyte) POPI();
jint index = POPI(); jint index = POPI();
jbyteArray arr = (jbyteArray) POPA(); jbyteArray arr = (jbyteArray) POPA();
NULLCHECK (arr); NULLARRAYCHECK (arr);
ARRAYBOUNDSCHECK (arr, index); ARRAYBOUNDSCHECK (arr, index);
elements(arr)[index] = value; elements(arr)[index] = value;
} }
NEXT_INSN; NEXT_INSN;
insn_castore: insn_castore:
SAVE_PC;
{ {
jchar value = (jchar) POPI(); jchar value = (jchar) POPI();
jint index = POPI(); jint index = POPI();
jcharArray arr = (jcharArray) POPA(); jcharArray arr = (jcharArray) POPA();
NULLCHECK (arr); NULLARRAYCHECK (arr);
ARRAYBOUNDSCHECK (arr, index); ARRAYBOUNDSCHECK (arr, index);
elements(arr)[index] = value; elements(arr)[index] = value;
} }
NEXT_INSN; NEXT_INSN;
insn_sastore: insn_sastore:
SAVE_PC;
{ {
jshort value = (jshort) POPI(); jshort value = (jshort) POPI();
jint index = POPI(); jint index = POPI();
jshortArray arr = (jshortArray) POPA(); jshortArray arr = (jshortArray) POPA();
NULLCHECK (arr); NULLARRAYCHECK (arr);
ARRAYBOUNDSCHECK (arr, index); ARRAYBOUNDSCHECK (arr, index);
elements(arr)[index] = value; elements(arr)[index] = value;
} }
...@@ -1357,7 +1346,6 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv) ...@@ -1357,7 +1346,6 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
NEXT_INSN; NEXT_INSN;
insn_fdiv: insn_fdiv:
SAVE_PC;
{ {
jfloat value2 = POPF(); jfloat value2 = POPF();
jfloat value1 = POPF(); jfloat value1 = POPF();
...@@ -1367,7 +1355,6 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv) ...@@ -1367,7 +1355,6 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
NEXT_INSN; NEXT_INSN;
insn_ddiv: insn_ddiv:
SAVE_PC;
{ {
jdouble value2 = POPD(); jdouble value2 = POPD();
jdouble value1 = POPD(); jdouble value1 = POPD();
...@@ -1397,7 +1384,6 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv) ...@@ -1397,7 +1384,6 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
NEXT_INSN; NEXT_INSN;
insn_frem: insn_frem:
SAVE_PC;
{ {
jfloat value2 = POPF(); jfloat value2 = POPF();
jfloat value1 = POPF(); jfloat value1 = POPF();
...@@ -1407,7 +1393,6 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv) ...@@ -1407,7 +1393,6 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
NEXT_INSN; NEXT_INSN;
insn_drem: insn_drem:
SAVE_PC;
{ {
jdouble value2 = POPD(); jdouble value2 = POPD();
jdouble value1 = POPD(); jdouble value1 = POPD();
...@@ -2185,10 +2170,9 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv) ...@@ -2185,10 +2170,9 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
NEXT_INSN; NEXT_INSN;
insn_arraylength: insn_arraylength:
SAVE_PC;
{ {
__JArray *arr = (__JArray*)POPA(); __JArray *arr = (__JArray*)POPA();
NULLCHECK (arr); NULLARRAYCHECK (arr);
PUSHI (arr->length); PUSHI (arr->length);
} }
NEXT_INSN; NEXT_INSN;
......
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