Skip to content

Commit

Permalink
8293976: Use unsigned integers in Assembler/CodeBuffer::emit_int*
Browse files Browse the repository at this point in the history
Reviewed-by: kvn, jbhateja
  • Loading branch information
merykitty authored and DamonFool committed Sep 20, 2022
1 parent fe541f0 commit a07902b
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 29 deletions.
20 changes: 10 additions & 10 deletions src/hotspot/share/asm/assembler.hpp
Expand Up @@ -282,21 +282,21 @@ class AbstractAssembler : public ResourceObj {
// ensure buf contains all code (call this before using/copying the code)
void flush();

void emit_int8( int8_t x1) { code_section()->emit_int8(x1); }
void emit_int8( uint8_t x1) { code_section()->emit_int8(x1); }

void emit_int16( int16_t x) { code_section()->emit_int16(x); }
void emit_int16( int8_t x1, int8_t x2) { code_section()->emit_int16(x1, x2); }
void emit_int16( uint16_t x) { code_section()->emit_int16(x); }
void emit_int16( uint8_t x1, uint8_t x2) { code_section()->emit_int16(x1, x2); }

void emit_int24( int8_t x1, int8_t x2, int8_t x3) { code_section()->emit_int24(x1, x2, x3); }
void emit_int24( uint8_t x1, uint8_t x2, uint8_t x3) { code_section()->emit_int24(x1, x2, x3); }

void emit_int32( int32_t x) { code_section()->emit_int32(x); }
void emit_int32( int8_t x1, int8_t x2, int8_t x3, int8_t x4) { code_section()->emit_int32(x1, x2, x3, x4); }
void emit_int32( uint32_t x) { code_section()->emit_int32(x); }
void emit_int32( uint8_t x1, uint8_t x2, uint8_t x3, uint8_t x4) { code_section()->emit_int32(x1, x2, x3, x4); }

void emit_int64( int64_t x) { code_section()->emit_int64(x); }
void emit_int64( uint64_t x) { code_section()->emit_int64(x); }

void emit_float( jfloat x) { code_section()->emit_float(x); }
void emit_double( jdouble x) { code_section()->emit_double(x); }
void emit_address(address x) { code_section()->emit_address(x); }
void emit_float( jfloat x) { code_section()->emit_float(x); }
void emit_double( jdouble x) { code_section()->emit_double(x); }
void emit_address(address x) { code_section()->emit_address(x); }

enum { min_simm10 = -512 };

Expand Down
38 changes: 19 additions & 19 deletions src/hotspot/share/asm/codeBuffer.hpp
Expand Up @@ -204,43 +204,43 @@ class CodeSection {
}

// Code emission
void emit_int8(int8_t x1) {
void emit_int8(uint8_t x1) {
address curr = end();
*((int8_t*) curr++) = x1;
*((uint8_t*) curr++) = x1;
set_end(curr);
}

void emit_int16(int16_t x) { *((int16_t*) end()) = x; set_end(end() + sizeof(int16_t)); }
void emit_int16(int8_t x1, int8_t x2) {
void emit_int16(uint16_t x) { *((uint16_t*) end()) = x; set_end(end() + sizeof(uint16_t)); }
void emit_int16(uint8_t x1, uint8_t x2) {
address curr = end();
*((int8_t*) curr++) = x1;
*((int8_t*) curr++) = x2;
*((uint8_t*) curr++) = x1;
*((uint8_t*) curr++) = x2;
set_end(curr);
}

void emit_int24(int8_t x1, int8_t x2, int8_t x3) {
void emit_int24(uint8_t x1, uint8_t x2, uint8_t x3) {
address curr = end();
*((int8_t*) curr++) = x1;
*((int8_t*) curr++) = x2;
*((int8_t*) curr++) = x3;
*((uint8_t*) curr++) = x1;
*((uint8_t*) curr++) = x2;
*((uint8_t*) curr++) = x3;
set_end(curr);
}

void emit_int32(int32_t x) {
void emit_int32(uint32_t x) {
address curr = end();
*((int32_t*) curr) = x;
set_end(curr + sizeof(int32_t));
*((uint32_t*) curr) = x;
set_end(curr + sizeof(uint32_t));
}
void emit_int32(int8_t x1, int8_t x2, int8_t x3, int8_t x4) {
void emit_int32(uint8_t x1, uint8_t x2, uint8_t x3, uint8_t x4) {
address curr = end();
*((int8_t*) curr++) = x1;
*((int8_t*) curr++) = x2;
*((int8_t*) curr++) = x3;
*((int8_t*) curr++) = x4;
*((uint8_t*) curr++) = x1;
*((uint8_t*) curr++) = x2;
*((uint8_t*) curr++) = x3;
*((uint8_t*) curr++) = x4;
set_end(curr);
}

void emit_int64( int64_t x) { *((int64_t*) end()) = x; set_end(end() + sizeof(int64_t)); }
void emit_int64( uint64_t x) { *((uint64_t*) end()) = x; set_end(end() + sizeof(uint64_t)); }

void emit_float( jfloat x) { *((jfloat*) end()) = x; set_end(end() + sizeof(jfloat)); }
void emit_double(jdouble x) { *((jdouble*) end()) = x; set_end(end() + sizeof(jdouble)); }
Expand Down

1 comment on commit a07902b

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.