1.1 --- a/src/share/vm/interpreter/templateTable.hpp Fri Feb 20 17:05:39 2015 +0000
1.2 +++ b/src/share/vm/interpreter/templateTable.hpp Tue Feb 24 15:04:52 2015 -0500
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -28,22 +28,15 @@
1.11 #include "interpreter/bytecodes.hpp"
1.12 #include "memory/allocation.hpp"
1.13 #include "runtime/frame.hpp"
1.14 -#ifdef TARGET_ARCH_x86
1.15 +#if defined INTERP_MASM_MD_HPP
1.16 +# include INTERP_MASM_MD_HPP
1.17 +#elif defined TARGET_ARCH_x86
1.18 # include "interp_masm_x86.hpp"
1.19 -#endif
1.20 -#ifdef TARGET_ARCH_MODEL_sparc
1.21 +#elif defined TARGET_ARCH_MODEL_sparc
1.22 # include "interp_masm_sparc.hpp"
1.23 -#endif
1.24 -#ifdef TARGET_ARCH_MODEL_zero
1.25 +#elif defined TARGET_ARCH_MODEL_zero
1.26 # include "interp_masm_zero.hpp"
1.27 -#endif
1.28 -#ifdef TARGET_ARCH_MODEL_arm
1.29 -# include "interp_masm_arm.hpp"
1.30 -#endif
1.31 -#ifdef TARGET_ARCH_MODEL_ppc_32
1.32 -# include "interp_masm_ppc_32.hpp"
1.33 -#endif
1.34 -#ifdef TARGET_ARCH_MODEL_ppc_64
1.35 +#elif defined TARGET_ARCH_MODEL_ppc_64
1.36 # include "interp_masm_ppc_64.hpp"
1.37 #endif
1.38
1.39 @@ -358,25 +351,17 @@
1.40 static Template* template_for_wide(Bytecodes::Code code) { Bytecodes::wide_check(code); return &_template_table_wide[code]; }
1.41
1.42 // Platform specifics
1.43 -#ifdef TARGET_ARCH_MODEL_x86_32
1.44 +#if defined TEMPLATETABLE_MD_HPP
1.45 +# include TEMPLATETABLE_MD_HPP
1.46 +#elif defined TARGET_ARCH_MODEL_x86_32
1.47 # include "templateTable_x86_32.hpp"
1.48 -#endif
1.49 -#ifdef TARGET_ARCH_MODEL_x86_64
1.50 +#elif defined TARGET_ARCH_MODEL_x86_64
1.51 # include "templateTable_x86_64.hpp"
1.52 -#endif
1.53 -#ifdef TARGET_ARCH_MODEL_sparc
1.54 +#elif defined TARGET_ARCH_MODEL_sparc
1.55 # include "templateTable_sparc.hpp"
1.56 -#endif
1.57 -#ifdef TARGET_ARCH_MODEL_zero
1.58 +#elif defined TARGET_ARCH_MODEL_zero
1.59 # include "templateTable_zero.hpp"
1.60 -#endif
1.61 -#ifdef TARGET_ARCH_MODEL_arm
1.62 -# include "templateTable_arm.hpp"
1.63 -#endif
1.64 -#ifdef TARGET_ARCH_MODEL_ppc_32
1.65 -# include "templateTable_ppc_32.hpp"
1.66 -#endif
1.67 -#ifdef TARGET_ARCH_MODEL_ppc_64
1.68 +#elif defined TARGET_ARCH_MODEL_ppc_64
1.69 # include "templateTable_ppc_64.hpp"
1.70 #endif
1.71
