Mercurial > hg > truffle
comparison src/cpu/x86/vm/stubGenerator_x86_64.cpp @ 4138:82af018d61db
Merge fixes.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Sat, 17 Dec 2011 22:03:44 +0100 |
parents | 04b9a2566eec |
children | 33df1aeaebbf |
comparison
equal
deleted
inserted
replaced
4137:04b9a2566eec | 4138:82af018d61db |
---|---|
2942 // AbstractMethodError on entry) are either at call sites or | 2942 // AbstractMethodError on entry) are either at call sites or |
2943 // otherwise assume that stack unwinding will be initiated, so | 2943 // otherwise assume that stack unwinding will be initiated, so |
2944 // caller saved registers were assumed volatile in the compiler. | 2944 // caller saved registers were assumed volatile in the compiler. |
2945 address generate_throw_exception(const char* name, | 2945 address generate_throw_exception(const char* name, |
2946 address runtime_entry, | 2946 address runtime_entry, |
2947 bool restore_saved_exception_pc, | |
2948 Register arg1 = noreg, | 2947 Register arg1 = noreg, |
2949 Register arg2 = noreg) { | 2948 Register arg2 = noreg) { |
2950 // Information about frame layout at time of blocking runtime call. | 2949 // Information about frame layout at time of blocking runtime call. |
2951 // Note that we only have to preserve callee-saved registers since | 2950 // Note that we only have to preserve callee-saved registers since |
2952 // the compilers are responsible for supplying a continuation point | 2951 // the compilers are responsible for supplying a continuation point |
3070 // expects the required and actual types as register arguments in | 3069 // expects the required and actual types as register arguments in |
3071 // j_rarg0 and j_rarg1 respectively. | 3070 // j_rarg0 and j_rarg1 respectively. |
3072 StubRoutines::_throw_WrongMethodTypeException_entry = | 3071 StubRoutines::_throw_WrongMethodTypeException_entry = |
3073 generate_throw_exception("WrongMethodTypeException throw_exception", | 3072 generate_throw_exception("WrongMethodTypeException throw_exception", |
3074 CAST_FROM_FN_PTR(address, SharedRuntime::throw_WrongMethodTypeException), | 3073 CAST_FROM_FN_PTR(address, SharedRuntime::throw_WrongMethodTypeException), |
3075 false, rax, rcx); | 3074 rax, rcx); |
3076 } | 3075 } |
3077 | 3076 |
3078 void generate_all() { | 3077 void generate_all() { |
3079 // Generates all stubs and initializes the entry points | 3078 // Generates all stubs and initializes the entry points |
3080 | 3079 |