1.1 --- a/src/share/vm/opto/runtime.cpp Wed Jun 19 12:29:30 2013 +0200
1.2 +++ b/src/share/vm/opto/runtime.cpp Thu Jun 20 16:30:44 2013 -0700
1.3 @@ -83,8 +83,11 @@
1.4 #ifdef TARGET_ARCH_MODEL_arm
1.5 # include "adfiles/ad_arm.hpp"
1.6 #endif
1.7 -#ifdef TARGET_ARCH_MODEL_ppc
1.8 -# include "adfiles/ad_ppc.hpp"
1.9 +#ifdef TARGET_ARCH_MODEL_ppc_32
1.10 +# include "adfiles/ad_ppc_32.hpp"
1.11 +#endif
1.12 +#ifdef TARGET_ARCH_MODEL_ppc_64
1.13 +# include "adfiles/ad_ppc_64.hpp"
1.14 #endif
1.15
1.16
1.17 @@ -977,7 +980,7 @@
1.18 nm = CodeCache::find_nmethod(pc);
1.19 assert(nm != NULL, "No NMethod found");
1.20 if (nm->is_native_method()) {
1.21 - fatal("Native mathod should not have path to exception handling");
1.22 + fatal("Native method should not have path to exception handling");
1.23 } else {
1.24 // we are switching to old paradigm: search for exception handler in caller_frame
1.25 // instead in exception handler of caller_frame.sender()
1.26 @@ -1006,7 +1009,7 @@
1.27 }
1.28
1.29 // If we are forcing an unwind because of stack overflow then deopt is
1.30 - // irrelevant sice we are throwing the frame away anyway.
1.31 + // irrelevant since we are throwing the frame away anyway.
1.32
1.33 if (deopting && !force_unwind) {
1.34 handler_address = SharedRuntime::deopt_blob()->unpack_with_exception();
1.35 @@ -1049,7 +1052,7 @@
1.36 // Note we enter without the usual JRT wrapper. We will call a helper routine that
1.37 // will do the normal VM entry. We do it this way so that we can see if the nmethod
1.38 // we looked up the handler for has been deoptimized in the meantime. If it has been
1.39 -// we must not use the handler and instread return the deopt blob.
1.40 +// we must not use the handler and instead return the deopt blob.
1.41 address OptoRuntime::handle_exception_C(JavaThread* thread) {
1.42 //
1.43 // We are in Java not VM and in debug mode we have a NoHandleMark
