Request to commit: Additional change for hs16 for ARM

[Gary Benson]

Ed, for changes like this, where the only things you're touching are
in files you have contributed (and nobody else knows what they are!)
I think you should be able to commit automatically.

Is that ok with everyone?

Cheers,
Gary

Edward Nevill wrote:
> Hi folks,
> 
> The following change resolves an undefined reference to
> SharedRuntime::generate_class_cast_message.
> 
> I have added an extern "C" function to asm_helper.cpp and then call
> that function from
> cppInterpreter_arm.S.
> 
> Ok to commit?
> 
> Regards,
> Ed.
> 
> --- old/icedtea6/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp	2009-10-29 17:50:33.000000000 +0000
> +++ new/icedtea6/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp	2009-10-30 09:48:51.000000000 +0000
> @@ -39,6 +39,11 @@
>  	return r0->end_addr();
>  }
>  
> +extern "C" char *SharedRuntime_generate_class_cast_message(const char *name, const char *klass)
> +{
> +	return SharedRuntime::generate_class_cast_message(name, klass);
> +}
> +
>  #endif // STATIC_OFFSETS
>  
>  #ifdef STATIC_OFFSETS
> diff -ruNE /java/enevill/hs16_3/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
> --- /java/enevill/hs16_3/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	2009-10-29 17:51:25.000000000 +0000
> +++ ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	2009-10-30 09:49:42.000000000 +0000
> @@ -3367,7 +3367,7 @@
>  	bl	_ZNK5Klass13external_nameEv
>  	mov	r1, r0
>  	mov	r0, tmp1
> -	bl	_ZN13SharedRuntime27generate_class_cast_messageEPKcS1_
> +	bl	SharedRuntime_generate_class_cast_message
>  	str	r0, [arm_sp, #0]
>  	ldr	r0, [istate, #ISTATE_THREAD]
>  	adrl	r1, bytecode_interpreter_str
> 
> 

-- 
http://gbenson.net/