archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

8227117: normal interpreter table is not restored after single stepping with TLH

Browse source 
Reviewed-by: sspitsyn, eosterlund, dholmes, coleenp
This commit is contained in:
Daniel D. Daugherty 2019-07-08 11:38:49 -04:00
parent 259a0b4a7b
commit 37b39bc642
2 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/hotspot/share/interpreter/templateInterpreter.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2019, 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
@ -29,6 +29,7 @@
#include "interpreter/templateInterpreter.hpp"
#include "interpreter/templateInterpreterGenerator.hpp"
#include "interpreter/templateTable.hpp"
#include "logging/log.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/timerTrace.hpp"
@ -283,9 +284,13 @@ static inline void copy_table(address* from, address* to, int size) {
void TemplateInterpreter::notice_safepoints() {
if (!_notice_safepoints) {
log_debug(interpreter, safepoint)("switching active_table to safept_table.");
// switch to safepoint dispatch table
_notice_safepoints = true;
copy_table((address*)&_safept_table, (address*)&_active_table, sizeof(_active_table) / sizeof(address));
} else {
log_debug(interpreter, safepoint)("active_table is already safept_table; "
"notice_safepoints() call is no-op.");
}
}
@ -297,10 +302,17 @@ void TemplateInterpreter::notice_safepoints() {
void TemplateInterpreter::ignore_safepoints() {
if (_notice_safepoints) {
if (!JvmtiExport::should_post_single_step()) {
log_debug(interpreter, safepoint)("switching active_table to normal_table.");
// switch to normal dispatch table
_notice_safepoints = false;
copy_table((address*)&_normal_table, (address*)&_active_table, sizeof(_active_table) / sizeof(address));
} else {
log_debug(interpreter, safepoint)("single stepping is still active; "
"ignoring ignore_safepoints() call.");
}
} else {
log_debug(interpreter, safepoint)("active_table is already normal_table; "
"ignore_safepoints() call is no-op.");
}
}