Commit 38fa6e73 by John David Anglin Committed by John David Anglin

re PR libgcj/23507 (gij testsuite failures)

	PR libgcj/23507
	* stacktrace.cc (_Jv_StackTrace::UnwindTraceFn): Fix typo in newLength
	assignment.  Cast operands of compare to function pointer type.

From-SVN: r103325
parent aa5190e9
2005-08-21 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
PR libgcj/23507
* stacktrace.cc (_Jv_StackTrace::UnwindTraceFn): Fix typo in newLength
assignment. Cast operands of compare to function pointer type.
2005-08-21 Tom Tromey <tromey@redhat.com> 2005-08-21 Tom Tromey <tromey@redhat.com>
* HACKING: Updated for hacking classpath in libgcj. * HACKING: Updated for hacking classpath in libgcj.
......
...@@ -102,7 +102,7 @@ _Jv_StackTrace::UnwindTraceFn (struct _Unwind_Context *context, void *state_ptr) ...@@ -102,7 +102,7 @@ _Jv_StackTrace::UnwindTraceFn (struct _Unwind_Context *context, void *state_ptr)
// Check if the trace buffer needs to be extended. // Check if the trace buffer needs to be extended.
if (pos == state->length) if (pos == state->length)
{ {
int newLength = state->length *= 2; int newLength = state->length * 2;
void *newFrames = _Jv_AllocBytes (newLength * sizeof(_Jv_StackFrame)); void *newFrames = _Jv_AllocBytes (newLength * sizeof(_Jv_StackFrame));
memcpy (newFrames, state->frames, state->length * sizeof(_Jv_StackFrame)); memcpy (newFrames, state->frames, state->length * sizeof(_Jv_StackFrame));
state->frames = (_Jv_StackFrame *) newFrames; state->frames = (_Jv_StackFrame *) newFrames;
...@@ -117,7 +117,7 @@ _Jv_StackTrace::UnwindTraceFn (struct _Unwind_Context *context, void *state_ptr) ...@@ -117,7 +117,7 @@ _Jv_StackTrace::UnwindTraceFn (struct _Unwind_Context *context, void *state_ptr)
// correspondance between call frames in the interpreted stack and occurances // correspondance between call frames in the interpreted stack and occurances
// of _Jv_InterpMethod::run() on the native stack. // of _Jv_InterpMethod::run() on the native stack.
#ifdef INTERPRETER #ifdef INTERPRETER
if (func_addr == (_Unwind_Ptr) &_Jv_InterpMethod::run) if ((void (*)(void)) func_addr == (void (*)(void)) &_Jv_InterpMethod::run)
{ {
state->frames[pos].type = frame_interpreter; state->frames[pos].type = frame_interpreter;
state->frames[pos].interp.meth = state->interp_frame->self; state->frames[pos].interp.meth = state->interp_frame->self;
......
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