Skip to content

Commit b8ea80a

Browse files
coleenpcoleenp
committed
8253457: Remove unimplemented register stack functions
Reviewed-by: iklam, dholmes, shade
1 parent e4d0e5a commit b8ea80a

File tree

12 files changed

+10
-175
lines changed

12 files changed

+10
-175
lines changed

‎src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.hpp

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -35,16 +35,6 @@
3535
frame pd_last_frame();
3636

3737
public:
38-
void set_base_of_stack_pointer(intptr_t* base_sp) {}
39-
intptr_t* base_of_stack_pointer() { return NULL; }
40-
void record_base_of_stack_pointer() {}
41-
42-
// These routines are only used on cpu architectures that
43-
// have separate register stacks (Itanium).
44-
static bool register_stack_overflow() { return false; }
45-
static void enable_register_stack_guard() {}
46-
static void disable_register_stack_guard() {}
47-
4838
bool pd_get_top_frame_for_signal_handler(frame* fr_addr, void* ucontext,
4939
bool isInJava);
5040

‎src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.hpp

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -37,19 +37,10 @@
3737
intptr_t* last_Java_fp() { return _anchor.last_Java_fp(); }
3838
void set_last_Java_fp(intptr_t* fp) { _anchor.set_last_Java_fp(fp); }
3939

40-
void set_base_of_stack_pointer(intptr_t* base_sp) {
41-
}
42-
4340
static ByteSize last_Java_fp_offset() {
4441
return byte_offset_of(JavaThread, _anchor) + JavaFrameAnchor::last_Java_fp_offset();
4542
}
4643

47-
intptr_t* base_of_stack_pointer() {
48-
return NULL;
49-
}
50-
void record_base_of_stack_pointer() {
51-
}
52-
5344
bool pd_get_top_frame_for_signal_handler(frame* fr_addr, void* ucontext,
5445
bool isInJava);
5546

@@ -58,12 +49,5 @@
5849

5950
private:
6051
bool pd_get_top_frame(frame* fr_addr, void* ucontext, bool isInJava);
61-
public:
62-
63-
// These routines are only used on cpu architectures that
64-
// have separate register stacks (Itanium).
65-
static bool register_stack_overflow() { return false; }
66-
static void enable_register_stack_guard() {}
67-
static void disable_register_stack_guard() {}
6852

6953
#endif // OS_CPU_BSD_X86_THREAD_BSD_X86_HPP

‎src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.hpp

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
33
* Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -60,15 +60,6 @@
6060
return byte_offset_of(JavaThread, _top_zero_frame);
6161
}
6262

63-
public:
64-
void record_base_of_stack_pointer() {
65-
assert(top_zero_frame() == NULL, "junk on stack prior to Java call");
66-
}
67-
void set_base_of_stack_pointer(intptr_t* base_sp) {
68-
assert(base_sp == NULL, "should be");
69-
assert(top_zero_frame() == NULL, "junk on stack after Java call");
70-
}
71-
7263
public:
7364
void set_last_Java_frame() {
7465
set_last_Java_frame(top_zero_frame(), zero_stack()->sp());
@@ -110,10 +101,4 @@
110101
return false;
111102
}
112103

113-
// These routines are only used on cpu architectures that
114-
// have separate register stacks (Itanium).
115-
static bool register_stack_overflow() { return false; }
116-
static void enable_register_stack_guard() {}
117-
static void disable_register_stack_guard() {}
118-
119104
#endif // OS_CPU_BSD_ZERO_THREAD_BSD_ZERO_HPP

‎src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -48,19 +48,10 @@
4848
intptr_t* last_Java_fp() { return _anchor.last_Java_fp(); }
4949
void set_last_Java_fp(intptr_t* fp) { _anchor.set_last_Java_fp(fp); }
5050

51-
void set_base_of_stack_pointer(intptr_t* base_sp) {
52-
}
53-
5451
static ByteSize last_Java_fp_offset() {
5552
return byte_offset_of(JavaThread, _anchor) + JavaFrameAnchor::last_Java_fp_offset();
5653
}
5754

58-
intptr_t* base_of_stack_pointer() {
59-
return NULL;
60-
}
61-
void record_base_of_stack_pointer() {
62-
}
63-
6455
bool pd_get_top_frame_for_signal_handler(frame* fr_addr, void* ucontext,
6556
bool isInJava);
6657

@@ -71,10 +62,4 @@
7162

7263
static Thread *aarch64_get_thread_helper();
7364

74-
// These routines are only used on cpu architectures that
75-
// have separate register stacks (Itanium).
76-
static bool register_stack_overflow() { return false; }
77-
static void enable_register_stack_guard() {}
78-
static void disable_register_stack_guard() {}
79-
8065
#endif // OS_CPU_LINUX_AARCH64_THREAD_LINUX_AARCH64_HPP

‎src/hotspot/os_cpu/linux_arm/thread_linux_arm.hpp

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -48,18 +48,6 @@
4848
return byte_offset_of(JavaThread, _anchor) + JavaFrameAnchor::last_Java_fp_offset();
4949
}
5050

51-
void set_base_of_stack_pointer(intptr_t* base_sp) {
52-
// Nothing to do
53-
}
54-
55-
intptr_t* base_of_stack_pointer() {
56-
return NULL;
57-
}
58-
59-
void record_base_of_stack_pointer() {
60-
// Nothing to do
61-
}
62-
6351
static ByteSize heap_top_addr_offset() { return byte_offset_of(JavaThread, _heap_top_addr); }
6452
static ByteSize card_table_base_offset() { return byte_offset_of(JavaThread, _card_table_base); }
6553

@@ -78,10 +66,4 @@
7866
bool pd_get_top_frame(frame* fr_addr, void* ucontext, bool isInJava);
7967
public:
8068

81-
// These routines are only used on cpu architectures that
82-
// have separate register stacks (Itanium).
83-
static bool register_stack_overflow() { return false; }
84-
static void enable_register_stack_guard() {}
85-
static void disable_register_stack_guard() {}
86-
8769
#endif // OS_CPU_LINUX_ARM_THREAD_LINUX_ARM_HPP

‎src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.hpp

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -37,16 +37,6 @@
3737

3838
public:
3939

40-
void set_base_of_stack_pointer(intptr_t* base_sp) {}
41-
intptr_t* base_of_stack_pointer() { return NULL; }
42-
void record_base_of_stack_pointer() {}
43-
44-
// These routines are only used on cpu architectures that
45-
// have separate register stacks (Itanium).
46-
static bool register_stack_overflow() { return false; }
47-
static void enable_register_stack_guard() {}
48-
static void disable_register_stack_guard() {}
49-
5040
bool pd_get_top_frame_for_signal_handler(frame* fr_addr, void* ucontext, bool isInJava);
5141

5242
bool pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava);

‎src/hotspot/os_cpu/linux_s390/thread_linux_s390.hpp

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2016 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -36,16 +36,6 @@
3636
frame pd_last_frame();
3737

3838
public:
39-
void set_base_of_stack_pointer(intptr_t* base_sp) {}
40-
intptr_t* base_of_stack_pointer() { return NULL; }
41-
void record_base_of_stack_pointer() {}
42-
43-
// These routines are only used on cpu architectures that
44-
// have separate register stacks (Itanium).
45-
static bool register_stack_overflow() { return false; }
46-
static void enable_register_stack_guard() {}
47-
static void disable_register_stack_guard() {}
48-
4939
bool pd_get_top_frame_for_signal_handler(frame* fr_addr, void* ucontext, bool isInJava);
5040

5141
bool pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava);

‎src/hotspot/os_cpu/linux_x86/thread_linux_x86.hpp

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -37,19 +37,10 @@
3737
intptr_t* last_Java_fp() { return _anchor.last_Java_fp(); }
3838
void set_last_Java_fp(intptr_t* fp) { _anchor.set_last_Java_fp(fp); }
3939

40-
void set_base_of_stack_pointer(intptr_t* base_sp) {
41-
}
42-
4340
static ByteSize last_Java_fp_offset() {
4441
return byte_offset_of(JavaThread, _anchor) + JavaFrameAnchor::last_Java_fp_offset();
4542
}
4643

47-
intptr_t* base_of_stack_pointer() {
48-
return NULL;
49-
}
50-
void record_base_of_stack_pointer() {
51-
}
52-
5344
bool pd_get_top_frame_for_signal_handler(frame* fr_addr, void* ucontext,
5445
bool isInJava);
5546

@@ -58,10 +49,4 @@
5849
bool pd_get_top_frame(frame* fr_addr, void* ucontext, bool isInJava);
5950
public:
6051

61-
// These routines are only used on cpu architectures that
62-
// have separate register stacks (Itanium).
63-
static bool register_stack_overflow() { return false; }
64-
static void enable_register_stack_guard() {}
65-
static void disable_register_stack_guard() {}
66-
6752
#endif // OS_CPU_LINUX_X86_THREAD_LINUX_X86_HPP

‎src/hotspot/os_cpu/linux_zero/thread_linux_zero.hpp

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
33
* Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -60,15 +60,6 @@
6060
return byte_offset_of(JavaThread, _top_zero_frame);
6161
}
6262

63-
public:
64-
void record_base_of_stack_pointer() {
65-
assert(top_zero_frame() == NULL, "junk on stack prior to Java call");
66-
}
67-
void set_base_of_stack_pointer(intptr_t* base_sp) {
68-
assert(base_sp == NULL, "should be");
69-
assert(top_zero_frame() == NULL, "junk on stack after Java call");
70-
}
71-
7263
public:
7364
void set_last_Java_frame() {
7465
set_last_Java_frame(top_zero_frame(), zero_stack()->sp());
@@ -117,11 +108,4 @@
117108
return false; // silence compile warning
118109
}
119110

120-
121-
// These routines are only used on cpu architectures that
122-
// have separate register stacks (Itanium).
123-
static bool register_stack_overflow() { return false; }
124-
static void enable_register_stack_guard() {}
125-
static void disable_register_stack_guard() {}
126-
127111
#endif // OS_CPU_LINUX_ZERO_THREAD_LINUX_ZERO_HPP

‎src/hotspot/os_cpu/windows_x86/thread_windows_x86.hpp

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -44,16 +44,10 @@
4444
intptr_t* last_Java_fp() { return _anchor.last_Java_fp(); }
4545
void set_last_Java_fp(intptr_t* fp) { _anchor.set_last_Java_fp(fp); }
4646

47-
void set_base_of_stack_pointer(intptr_t* base_sp) {}
48-
49-
5047
static ByteSize last_Java_fp_offset() {
5148
return byte_offset_of(JavaThread, _anchor) + JavaFrameAnchor::last_Java_fp_offset();
5249
}
5350

54-
intptr_t* base_of_stack_pointer() { return NULL; }
55-
void record_base_of_stack_pointer() {}
56-
5751
bool pd_get_top_frame_for_signal_handler(frame* fr_addr, void* ucontext,
5852
bool isInJava);
5953

@@ -64,11 +58,4 @@
6458
private:
6559
bool pd_get_top_frame(frame* fr_addr, void* ucontext, bool isInJava);
6660

67-
public:
68-
// These routines are only used on cpu architectures that
69-
// have separate register stacks (Itanium).
70-
static bool register_stack_overflow() { return false; }
71-
static void enable_register_stack_guard() {}
72-
static void disable_register_stack_guard() {}
73-
7461
#endif // OS_CPU_WINDOWS_X86_THREAD_WINDOWS_X86_HPP

0 commit comments

Comments
 (0)