Skip to content

Commit 7ee89a5

Browse files
committed
8350893: Use generated names for hand generated opto runtime blobs
Reviewed-by: kvn
1 parent fae37aa commit 7ee89a5

File tree

9 files changed

+29
-15
lines changed

9 files changed

+29
-15
lines changed

src/hotspot/cpu/aarch64/runtime_aarch64.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ void OptoRuntime::generate_uncommon_trap_blob() {
6363
// Allocate space for the code
6464
ResourceMark rm;
6565
// Setup code generation tools
66-
CodeBuffer buffer("uncommon_trap_blob", 2048, 1024);
66+
const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
67+
CodeBuffer buffer(name, 2048, 1024);
6768
MacroAssembler* masm = new MacroAssembler(&buffer);
6869

6970
assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
@@ -282,7 +283,8 @@ void OptoRuntime::generate_exception_blob() {
282283
// Allocate space for the code
283284
ResourceMark rm;
284285
// Setup code generation tools
285-
CodeBuffer buffer("exception_blob", 2048, 1024);
286+
const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
287+
CodeBuffer buffer(name, 2048, 1024);
286288
MacroAssembler* masm = new MacroAssembler(&buffer);
287289

288290
// TODO check various assumptions made here

src/hotspot/cpu/arm/runtime_arm.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,12 @@ void OptoRuntime::generate_uncommon_trap_blob() {
4747
ResourceMark rm;
4848

4949
// setup code generation tools
50+
const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
5051
#ifdef _LP64
51-
CodeBuffer buffer("uncommon_trap_blob", 2700, 512);
52+
CodeBuffer buffer(name, 2700, 512);
5253
#else
5354
// Measured 8/7/03 at 660 in 32bit debug build
54-
CodeBuffer buffer("uncommon_trap_blob", 2000, 512);
55+
CodeBuffer buffer(name, 2000, 512);
5556
#endif
5657
// bypassed when code generation useless
5758
MacroAssembler* masm = new MacroAssembler(&buffer);
@@ -206,7 +207,8 @@ void OptoRuntime::generate_exception_blob() {
206207

207208
// setup code generation tools
208209
// Measured 8/7/03 at 256 in 32bit debug build
209-
CodeBuffer buffer("exception_blob", 600, 512);
210+
const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
211+
CodeBuffer buffer(name, 600, 512);
210212
MacroAssembler* masm = new MacroAssembler(&buffer);
211213

212214
int framesize_in_words = 2; // FP + LR

src/hotspot/cpu/ppc/runtime_ppc.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ void OptoRuntime::generate_exception_blob() {
7171
// Allocate space for the code.
7272
ResourceMark rm;
7373
// Setup code generation tools.
74-
CodeBuffer buffer("exception_blob", 2048, 1024);
74+
const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
75+
CodeBuffer buffer(name, 2048, 1024);
7576
InterpreterMacroAssembler* masm = new InterpreterMacroAssembler(&buffer);
7677

7778
address start = __ pc();

src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3104,7 +3104,8 @@ void OptoRuntime::generate_uncommon_trap_blob() {
31043104
// Allocate space for the code.
31053105
ResourceMark rm;
31063106
// Setup code generation tools.
3107-
CodeBuffer buffer("uncommon_trap_blob", 2048, 1024);
3107+
const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
3108+
CodeBuffer buffer(name, 2048, 1024);
31083109
InterpreterMacroAssembler* masm = new InterpreterMacroAssembler(&buffer);
31093110
address start = __ pc();
31103111

src/hotspot/cpu/riscv/runtime_riscv.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ void OptoRuntime::generate_uncommon_trap_blob() {
6161
// Allocate space for the code
6262
ResourceMark rm;
6363
// Setup code generation tools
64-
CodeBuffer buffer("uncommon_trap_blob", 2048, 1024);
64+
const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
65+
CodeBuffer buffer(name, 2048, 1024);
6566
MacroAssembler* masm = new MacroAssembler(&buffer);
6667
assert_cond(masm != nullptr);
6768

@@ -279,7 +280,8 @@ void OptoRuntime::generate_exception_blob() {
279280
// Allocate space for the code
280281
ResourceMark rm;
281282
// Setup code generation tools
282-
CodeBuffer buffer("exception_blob", 2048, 1024);
283+
const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
284+
CodeBuffer buffer(name, 2048, 1024);
283285
MacroAssembler* masm = new MacroAssembler(&buffer);
284286
assert_cond(masm != nullptr);
285287

src/hotspot/cpu/s390/runtime_s390.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ void OptoRuntime::generate_exception_blob() {
7070
// Allocate space for the code
7171
ResourceMark rm;
7272
// Setup code generation tools
73-
CodeBuffer buffer("exception_blob", 2048, 1024);
73+
const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
74+
CodeBuffer buffer(name, 2048, 1024);
7475
MacroAssembler* masm = new MacroAssembler(&buffer);
7576

7677
Register handle_exception = Z_ARG5;

src/hotspot/cpu/s390/sharedRuntime_s390.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2766,7 +2766,8 @@ void OptoRuntime::generate_uncommon_trap_blob() {
27662766
// Allocate space for the code
27672767
ResourceMark rm;
27682768
// Setup code generation tools
2769-
CodeBuffer buffer("uncommon_trap_blob", 2048, 1024);
2769+
const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
2770+
CodeBuffer buffer(name, 2048, 1024);
27702771
InterpreterMacroAssembler* masm = new InterpreterMacroAssembler(&buffer);
27712772

27722773
Register unroll_block_reg = Z_tmp_1;

src/hotspot/cpu/x86/runtime_x86_32.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ void OptoRuntime::generate_uncommon_trap_blob() {
4545
// allocate space for the code
4646
ResourceMark rm;
4747
// setup code generation tools
48-
CodeBuffer buffer("uncommon_trap_blob", 512, 512);
48+
const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
49+
CodeBuffer buffer(name, 512, 512);
4950
MacroAssembler* masm = new MacroAssembler(&buffer);
5051

5152
enum frame_layout {
@@ -255,7 +256,8 @@ void OptoRuntime::generate_exception_blob() {
255256
// allocate space for the code
256257
ResourceMark rm;
257258
// setup code generation tools
258-
CodeBuffer buffer("exception_blob", 512, 512);
259+
const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
260+
CodeBuffer buffer(name, 512, 512);
259261
MacroAssembler* masm = new MacroAssembler(&buffer);
260262

261263
OopMapSet *oop_maps = new OopMapSet();

src/hotspot/cpu/x86/runtime_x86_64.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ void OptoRuntime::generate_uncommon_trap_blob() {
5959
// Allocate space for the code
6060
ResourceMark rm;
6161
// Setup code generation tools
62-
CodeBuffer buffer("uncommon_trap_blob", 2048, 1024);
62+
const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
63+
CodeBuffer buffer(name, 2048, 1024);
6364
MacroAssembler* masm = new MacroAssembler(&buffer);
6465

6566
assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
@@ -264,7 +265,8 @@ void OptoRuntime::generate_exception_blob() {
264265
// Allocate space for the code
265266
ResourceMark rm;
266267
// Setup code generation tools
267-
CodeBuffer buffer("exception_blob", 2048, 1024);
268+
const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
269+
CodeBuffer buffer(name, 2048, 1024);
268270
MacroAssembler* masm = new MacroAssembler(&buffer);
269271

270272

0 commit comments

Comments
 (0)