OpenJDK / amber / amber
changeset 36063:96e86c7f8fec
8149689: [JVMCI] CodeInstaller::pd_patch_DataSectionReference should be able to throw exceptions
Reviewed-by: kvn
| author | twisti |
|---|---|
| date | Thu, 11 Feb 2016 12:29:40 -1000 |
| parents | cbf216589e14 |
| children | 20a60a2de977 |
| files | hotspot/src/cpu/aarch64/vm/jvmciCodeInstaller_aarch64.cpp hotspot/src/cpu/ppc/vm/jvmciCodeInstaller_ppc.cpp hotspot/src/cpu/sparc/vm/jvmciCodeInstaller_sparc.cpp hotspot/src/cpu/x86/vm/jvmciCodeInstaller_x86.cpp hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp hotspot/src/share/vm/jvmci/jvmciCodeInstaller.hpp |
| diffstat | 6 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/cpu/aarch64/vm/jvmciCodeInstaller_aarch64.cpp Thu Feb 11 11:32:44 2016 -1000 +++ b/hotspot/src/cpu/aarch64/vm/jvmciCodeInstaller_aarch64.cpp Thu Feb 11 12:29:40 2016 -1000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -71,7 +71,7 @@ } } -void CodeInstaller::pd_patch_DataSectionReference(int pc_offset, int data_offset) { +void CodeInstaller::pd_patch_DataSectionReference(int pc_offset, int data_offset, TRAPS) { address pc = _instructions->start() + pc_offset; NativeInstruction* inst = nativeInstruction_at(pc); if (inst->is_adr_aligned()) {
--- a/hotspot/src/cpu/ppc/vm/jvmciCodeInstaller_ppc.cpp Thu Feb 11 11:32:44 2016 -1000 +++ b/hotspot/src/cpu/ppc/vm/jvmciCodeInstaller_ppc.cpp Thu Feb 11 12:29:40 2016 -1000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -42,7 +42,7 @@ Unimplemented(); } -void CodeInstaller::pd_patch_DataSectionReference(int pc_offset, int data_offset) { +void CodeInstaller::pd_patch_DataSectionReference(int pc_offset, int data_offset, TRAPS) { Unimplemented(); }
--- a/hotspot/src/cpu/sparc/vm/jvmciCodeInstaller_sparc.cpp Thu Feb 11 11:32:44 2016 -1000 +++ b/hotspot/src/cpu/sparc/vm/jvmciCodeInstaller_sparc.cpp Thu Feb 11 12:29:40 2016 -1000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -85,7 +85,7 @@ } } -void CodeInstaller::pd_patch_DataSectionReference(int pc_offset, int data_offset) { +void CodeInstaller::pd_patch_DataSectionReference(int pc_offset, int data_offset, TRAPS) { address pc = _instructions->start() + pc_offset; NativeInstruction* inst = nativeInstruction_at(pc); NativeInstruction* inst1 = nativeInstruction_at(pc + 4);
--- a/hotspot/src/cpu/x86/vm/jvmciCodeInstaller_x86.cpp Thu Feb 11 11:32:44 2016 -1000 +++ b/hotspot/src/cpu/x86/vm/jvmciCodeInstaller_x86.cpp Thu Feb 11 12:29:40 2016 -1000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -101,7 +101,7 @@ } } -void CodeInstaller::pd_patch_DataSectionReference(int pc_offset, int data_offset) { +void CodeInstaller::pd_patch_DataSectionReference(int pc_offset, int data_offset, TRAPS) { address pc = _instructions->start() + pc_offset; address operand = Assembler::locate_operand(pc, Assembler::disp32_operand);
--- a/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp Thu Feb 11 11:32:44 2016 -1000 +++ b/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp Thu Feb 11 12:29:40 2016 -1000 @@ -1091,7 +1091,7 @@ } else if (reference->is_a(site_DataSectionReference::klass())) { int data_offset = site_DataSectionReference::offset(reference); if (0 <= data_offset && data_offset < _constants_size) { - pd_patch_DataSectionReference(pc_offset, data_offset); + pd_patch_DataSectionReference(pc_offset, data_offset, CHECK); } else { JVMCI_ERROR("data offset 0x%X points outside data section (size 0x%X)", data_offset, _constants_size); }
--- a/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.hpp Thu Feb 11 11:32:44 2016 -1000 +++ b/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.hpp Thu Feb 11 12:29:40 2016 -1000 @@ -156,7 +156,7 @@ jint pd_next_offset(NativeInstruction* inst, jint pc_offset, Handle method, TRAPS); void pd_patch_OopConstant(int pc_offset, Handle constant, TRAPS); void pd_patch_MetaspaceConstant(int pc_offset, Handle constant, TRAPS); - void pd_patch_DataSectionReference(int pc_offset, int data_offset); + void pd_patch_DataSectionReference(int pc_offset, int data_offset, TRAPS); void pd_relocate_ForeignCall(NativeInstruction* inst, jlong foreign_call_destination, TRAPS); void pd_relocate_JavaMethod(Handle method, jint pc_offset, TRAPS); void pd_relocate_poll(address pc, jint mark, TRAPS);