mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-28 07:14:30 +02:00
8030076: remove unused runtime related code
Small cleanup of runtime code Reviewed-by: dholmes, coleenp
This commit is contained in:
parent
83a0dd66c5
commit
d046f1596b
7 changed files with 4 additions and 53 deletions
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
|
@ -357,12 +357,6 @@ public abstract class Frame implements Cloneable {
|
||||||
// FIXME: avoiding implementing this for now if possible
|
// FIXME: avoiding implementing this for now if possible
|
||||||
// public void interpreter_frame_set_monitor_end(BasicObjectLock* value);
|
// public void interpreter_frame_set_monitor_end(BasicObjectLock* value);
|
||||||
// public void interpreter_frame_verify_monitor(BasicObjectLock* value) const;
|
// public void interpreter_frame_verify_monitor(BasicObjectLock* value) const;
|
||||||
//
|
|
||||||
// Tells whether the current interpreter_frame frame pointer
|
|
||||||
// corresponds to the old compiled/deoptimized fp
|
|
||||||
// The receiver used to be a top level frame
|
|
||||||
// public boolean interpreter_frame_equals_unpacked_fp(intptr_t* fp);
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------
|
||||||
// Method and constant pool cache:
|
// Method and constant pool cache:
|
||||||
//
|
//
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||||
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
|
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
|
@ -526,16 +526,6 @@ frame frame::sender(RegisterMap* map) const {
|
||||||
return frame(sender_sp(), link(), sender_pc());
|
return frame(sender_sp(), link(), sender_pc());
|
||||||
}
|
}
|
||||||
|
|
||||||
bool frame::interpreter_frame_equals_unpacked_fp(intptr_t* fp) {
|
|
||||||
assert(is_interpreted_frame(), "must be interpreter frame");
|
|
||||||
Method* method = interpreter_frame_method();
|
|
||||||
// When unpacking an optimized frame the frame pointer is
|
|
||||||
// adjusted with:
|
|
||||||
int diff = (method->max_locals() - method->size_of_parameters()) *
|
|
||||||
Interpreter::stackElementWords;
|
|
||||||
return _fp == (fp - diff);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
|
bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
|
||||||
// QQQ
|
// QQQ
|
||||||
#ifdef CC_INTERP
|
#ifdef CC_INTERP
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
|
@ -599,12 +599,6 @@ bool frame::is_valid_stack_pointer(intptr_t* valid_sp, intptr_t* sp) {
|
||||||
return next_younger_sp_or_null(valid_sp, sp) != NULL;
|
return next_younger_sp_or_null(valid_sp, sp) != NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool frame::interpreter_frame_equals_unpacked_fp(intptr_t* fp) {
|
|
||||||
assert(is_interpreted_frame(), "must be interpreter frame");
|
|
||||||
return this->fp() == fp;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
|
bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
|
||||||
#ifdef CC_INTERP
|
#ifdef CC_INTERP
|
||||||
// Is there anything to do?
|
// Is there anything to do?
|
||||||
|
|
|
@ -524,17 +524,6 @@ frame frame::sender(RegisterMap* map) const {
|
||||||
return frame(sender_sp(), link(), sender_pc());
|
return frame(sender_sp(), link(), sender_pc());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool frame::interpreter_frame_equals_unpacked_fp(intptr_t* fp) {
|
|
||||||
assert(is_interpreted_frame(), "must be interpreter frame");
|
|
||||||
Method* method = interpreter_frame_method();
|
|
||||||
// When unpacking an optimized frame the frame pointer is
|
|
||||||
// adjusted with:
|
|
||||||
int diff = (method->max_locals() - method->size_of_parameters()) *
|
|
||||||
Interpreter::stackElementWords;
|
|
||||||
return _fp == (fp - diff);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
|
bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
|
||||||
// QQQ
|
// QQQ
|
||||||
#ifdef CC_INTERP
|
#ifdef CC_INTERP
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
|
@ -102,7 +102,6 @@ class TemplateInterpreter: public AbstractInterpreter {
|
||||||
static address _throw_ArrayStoreException_entry;
|
static address _throw_ArrayStoreException_entry;
|
||||||
static address _throw_ArithmeticException_entry;
|
static address _throw_ArithmeticException_entry;
|
||||||
static address _throw_ClassCastException_entry;
|
static address _throw_ClassCastException_entry;
|
||||||
static address _throw_WrongMethodType_entry;
|
|
||||||
static address _throw_NullPointerException_entry;
|
static address _throw_NullPointerException_entry;
|
||||||
static address _throw_exception_entry;
|
static address _throw_exception_entry;
|
||||||
|
|
||||||
|
@ -148,7 +147,6 @@ class TemplateInterpreter: public AbstractInterpreter {
|
||||||
static address remove_activation_entry() { return _remove_activation_entry; }
|
static address remove_activation_entry() { return _remove_activation_entry; }
|
||||||
static address throw_exception_entry() { return _throw_exception_entry; }
|
static address throw_exception_entry() { return _throw_exception_entry; }
|
||||||
static address throw_ArithmeticException_entry() { return _throw_ArithmeticException_entry; }
|
static address throw_ArithmeticException_entry() { return _throw_ArithmeticException_entry; }
|
||||||
static address throw_WrongMethodType_entry() { return _throw_WrongMethodType_entry; }
|
|
||||||
static address throw_NullPointerException_entry() { return _throw_NullPointerException_entry; }
|
static address throw_NullPointerException_entry() { return _throw_NullPointerException_entry; }
|
||||||
static address throw_StackOverflowError_entry() { return _throw_StackOverflowError_entry; }
|
static address throw_StackOverflowError_entry() { return _throw_StackOverflowError_entry; }
|
||||||
|
|
||||||
|
|
|
@ -307,11 +307,6 @@ class frame VALUE_OBJ_CLASS_SPEC {
|
||||||
|
|
||||||
void interpreter_frame_verify_monitor(BasicObjectLock* value) const;
|
void interpreter_frame_verify_monitor(BasicObjectLock* value) const;
|
||||||
|
|
||||||
// Tells whether the current interpreter_frame frame pointer
|
|
||||||
// corresponds to the old compiled/deoptimized fp
|
|
||||||
// The receiver used to be a top level frame
|
|
||||||
bool interpreter_frame_equals_unpacked_fp(intptr_t* fp);
|
|
||||||
|
|
||||||
// Return/result value from this interpreter frame
|
// Return/result value from this interpreter frame
|
||||||
// If the method return type is T_OBJECT or T_ARRAY populates oop_result
|
// If the method return type is T_OBJECT or T_ARRAY populates oop_result
|
||||||
// For other (non-T_VOID) the appropriate field in the jvalue is populated
|
// For other (non-T_VOID) the appropriate field in the jvalue is populated
|
||||||
|
|
|
@ -2335,15 +2335,6 @@ AdapterHandlerEntry* AdapterHandlerLibrary::get_adapter(methodHandle method) {
|
||||||
// and a single writer: this could be fixed if it becomes a
|
// and a single writer: this could be fixed if it becomes a
|
||||||
// problem).
|
// problem).
|
||||||
|
|
||||||
// Get the address of the ic_miss handlers before we grab the
|
|
||||||
// AdapterHandlerLibrary_lock. This fixes bug 6236259 which
|
|
||||||
// was caused by the initialization of the stubs happening
|
|
||||||
// while we held the lock and then notifying jvmti while
|
|
||||||
// holding it. This just forces the initialization to be a little
|
|
||||||
// earlier.
|
|
||||||
address ic_miss = SharedRuntime::get_ic_miss_stub();
|
|
||||||
assert(ic_miss != NULL, "must have handler");
|
|
||||||
|
|
||||||
ResourceMark rm;
|
ResourceMark rm;
|
||||||
|
|
||||||
NOT_PRODUCT(int insts_size);
|
NOT_PRODUCT(int insts_size);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue