Mercurial > hg > jdk9-shenandoah > hotspot
changeset 8803:2ac9b6b36689 jdk9-b63
Merge
author | lana |
---|---|
date | Thu, 30 Apr 2015 17:20:25 -0700 |
parents | 86ab44ce262e (current diff) 3e2b525194d3 (diff) |
children | d6b3ad413923 e0ad42748972 |
files | |
diffstat | 5 files changed, 11 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/make/windows/makefiles/compile.make Thu Apr 30 13:02:03 2015 -0700 +++ b/make/windows/makefiles/compile.make Thu Apr 30 17:20:25 2015 -0700 @@ -74,7 +74,8 @@ !if "$(BUILDARCH)" == "i486" MACHINE=I386 -CXX_FLAGS=$(CXX_FLAGS) /D "IA32" +# VS2013 generates bad l2f without /arch:IA32 +CXX_FLAGS=$(CXX_FLAGS) /D "IA32" /arch:IA32 !endif CXX_FLAGS=$(CXX_FLAGS) /D "WIN32" /D "_WINDOWS"
--- a/src/cpu/aarch64/vm/aarch64.ad Thu Apr 30 13:02:03 2015 -0700 +++ b/src/cpu/aarch64/vm/aarch64.ad Thu Apr 30 17:20:25 2015 -0700 @@ -449,7 +449,7 @@ R26 /* R27, */ // heapbase /* R28, */ // thread - /* R29, */ // fp + R29, // fp /* R30, */ // lr /* R31 */ // sp ); @@ -483,7 +483,7 @@ R26, R26_H, /* R27, R27_H, */ // heapbase /* R28, R28_H, */ // thread - /* R29, R29_H, */ // fp + R29, R29_H, // fp /* R30, R30_H, */ // lr /* R31, R31_H */ // sp ); @@ -758,6 +758,8 @@ source_hpp %{ +#include "memory/cardTableModRefBS.hpp" + class CallStubImpl { //-------------------------------------------------------------- @@ -2538,7 +2540,7 @@ } const RegMask Matcher::method_handle_invoke_SP_save_mask() { - return RegMask(); + return FP_REG_mask(); } // helper for encoding java_to_runtime calls on sim
--- a/src/cpu/aarch64/vm/frame_aarch64.inline.hpp Thu Apr 30 13:02:03 2015 -0700 +++ b/src/cpu/aarch64/vm/frame_aarch64.inline.hpp Thu Apr 30 17:20:25 2015 -0700 @@ -77,12 +77,6 @@ inline frame::frame(intptr_t* sp, intptr_t* unextended_sp, intptr_t* fp, address pc) { intptr_t a = intptr_t(sp); intptr_t b = intptr_t(fp); -#ifndef PRODUCT - if (fp) - if (sp > fp || (fp - sp > 0x100000)) - for(;;) - asm("nop"); -#endif _sp = sp; _unextended_sp = unextended_sp; _fp = fp; @@ -104,12 +98,6 @@ inline frame::frame(intptr_t* sp, intptr_t* fp) { intptr_t a = intptr_t(sp); intptr_t b = intptr_t(fp); -#ifndef PRODUCT - if (fp) - if (sp > fp || (fp - sp > 0x100000)) - for(;;) - asm("nop"); -#endif _sp = sp; _unextended_sp = sp; _fp = fp;
--- a/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp Thu Apr 30 13:02:03 2015 -0700 +++ b/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp Thu Apr 30 17:20:25 2015 -0700 @@ -32,22 +32,14 @@ #include "compiler/disassembler.hpp" #include "memory/resourceArea.hpp" +#include "nativeInst_aarch64.hpp" +#include "opto/compile.hpp" +#include "opto/node.hpp" #include "runtime/biasedLocking.hpp" #include "runtime/icache.hpp" #include "runtime/interfaceSupport.hpp" #include "runtime/sharedRuntime.hpp" -// #include "gc_interface/collectedHeap.inline.hpp" -// #include "interpreter/interpreter.hpp" -// #include "memory/cardTableModRefBS.hpp" -// #include "prims/methodHandles.hpp" -// #include "runtime/biasedLocking.hpp" -// #include "runtime/interfaceSupport.hpp" -// #include "runtime/objectMonitor.hpp" -// #include "runtime/os.hpp" -// #include "runtime/sharedRuntime.hpp" -// #include "runtime/stubRoutines.hpp" - #if INCLUDE_ALL_GCS #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
--- a/test/compiler/floatingpoint/ModNaN.java Thu Apr 30 13:02:03 2015 -0700 +++ b/test/compiler/floatingpoint/ModNaN.java Thu Apr 30 17:20:25 2015 -0700 @@ -25,7 +25,7 @@ * @test * @bug 8015396 * @summary double a%b returns NaN for some (a,b) (|a| < inf, |b|>0) (on Core i7 980X) - * + * @ignore 8015396 * @run main ModNaN */ public class ModNaN {