Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Automatic merge of jdk:master into master
  • Loading branch information
duke committed Sep 11, 2020
2 parents 994240f + 040c8f5 commit 521ad857be9ae8e4554f5eb030717a233407fbc8
Show file tree
Hide file tree
Showing 11 changed files with 0 additions and 44 deletions.
@@ -4043,9 +4043,6 @@ encode %{
// SP meets the minimum alignment.

frame %{
// What direction does stack grow in (assumed to be same for C & Java)
stack_direction(TOWARDS_LOW);

// These three registers define part of the calling convention
// between compiled code and the interpreter.

@@ -1664,9 +1664,6 @@ encode %{
// the region from SP to FP meets the minimum stack alignment.

frame %{
// What direction does stack grow in (assumed to be same for native & Java)
stack_direction(TOWARDS_LOW);

// These two registers define part of the calling convention
// between compiled code and the interpreter.
inline_cache_reg(R_Ricklass); // Inline Cache Register or Method* for I2C
@@ -4118,9 +4118,6 @@ encode %{
// Definition of frame structure and management information.

frame %{
// What direction does stack grow in (assumed to be same for native & Java).
stack_direction(TOWARDS_LOW);

// These two registers define part of the calling convention between
// compiled code and the interpreter.

@@ -2456,9 +2456,6 @@ source %{
// Definition of frame structure and management information.

frame %{
// What direction does stack grow in (assumed to be same for native & Java).
stack_direction(TOWARDS_LOW);

// These two registers define part of the calling convention between
// compiled code and the interpreter.

@@ -3191,9 +3191,6 @@ encode %{
// the region from SP to FP meets the minimum stack alignment.

frame %{
// What direction does stack grow in (assumed to be same for C & Java)
stack_direction(TOWARDS_LOW);

// These three registers define part of the calling convention
// between compiled code and the interpreter.
inline_cache_reg(EAX); // Inline Cache Register
@@ -2740,9 +2740,6 @@ encode %{

frame
%{
// What direction does stack grow in (assumed to be same for C & Java)
stack_direction(TOWARDS_LOW);

// These three registers define part of the calling convention
// between compiled code and the interpreter.
inline_cache_reg(RAX); // Inline Cache Register
@@ -985,9 +985,6 @@ void ADLParser::frame_parse(void) {
parse_err(SYNERR, "missing identifier inside frame block.\n");
return;
}
if (strcmp(token,"stack_direction")==0) {
stack_dir_parse(frame);
}
if (strcmp(token,"sync_stack_slots")==0) {
sync_stack_slots_parse(frame);
}
@@ -1109,21 +1106,6 @@ void ADLParser::frame_parse(void) {
// skipws();
}

//------------------------------stack_dir_parse--------------------------------
void ADLParser::stack_dir_parse(FrameForm *frame) {
char *direction = parse_one_arg("stack direction entry");
if (strcmp(direction, "TOWARDS_LOW") == 0) {
frame->_direction = false;
}
else if (strcmp(direction, "TOWARDS_HIGH") == 0) {
frame->_direction = true;
}
else {
parse_err(SYNERR, "invalid value inside stack direction entry.\n");
return;
}
}

//------------------------------sync_stack_slots_parse-------------------------
void ADLParser::sync_stack_slots_parse(FrameForm *frame) {
// Assign value into frame form
@@ -110,7 +110,6 @@ class ADLParser {
void enc_class_parse_block(EncClass* encoding, char* ec_name);

// Parse the components of the frame section
void stack_dir_parse(FrameForm *frame); // Parse the stack direction entry
void sync_stack_slots_parse(FrameForm *frame);
void frame_pointer_parse(FrameForm *frame, bool native);
void interpreter_frame_pointer_parse(FrameForm *frame, bool native);
@@ -334,7 +334,6 @@ class FrameForm : public Form {

public:
// Public Data
bool _direction; // Direction of stack growth
char *_sync_stack_slots;
char *_inline_cache_reg;
char *_interpreter_method_oop_reg;
@@ -4143,9 +4143,6 @@ void ArchDesc::buildInstructMatchCheck(FILE *fp_cpp) const {
// Output the methods to Matcher which specify frame behavior
void ArchDesc::buildFrameMethods(FILE *fp_cpp) {
fprintf(fp_cpp,"\n\n");
// Stack Direction
fprintf(fp_cpp,"bool Matcher::stack_direction() const { return %s; }\n\n",
_frame->_direction ? "true" : "false");
// Sync Stack Slots
fprintf(fp_cpp,"int Compile::sync_stack_slots() const { return %s; }\n\n",
_frame->_sync_stack_slots);
@@ -358,9 +358,6 @@ class Matcher : public PhaseTransform {

// These calls are all generated by the ADLC

// TRUE - grows up, FALSE - grows down (Intel)
virtual bool stack_direction() const;

// Java-Java calling convention
// (what you use when Java calls Java)

0 comments on commit 521ad85

Please sign in to comment.