Skip to content

Commit 2e2b5df

Browse files
committed
Merge branch 'ramenrrami-arm64' into arm64
2 parents 9341e8d + aff8491 commit 2e2b5df

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

src/jit/decoder/arm32.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,10 @@ void arm32_add_instruction(arm32_decoder_t* decoder, const char* name, const cha
6060
PVM_ASSERT(nullptr != bitstring);
6161
PVM_ASSERT(decoder->instruction_count < decoder->instruction_capacity);
6262

63-
LOG_TRACE("Adding '%s' instruction to lookup table.", name);
6463
arm32_opcode_t mask = 0;
6564
arm32_opcode_t expected = 0;
6665
arm32_parse_bitstring(bitstring, &mask, &expected);
6766

68-
LOG_TRACE("Mask: %x", mask);
69-
LOG_TRACE("Expected: %x", expected);
70-
7167
arm32_instruction_info_t* info = &decoder->instructions[decoder->instruction_count];
7268
info->name = name;
7369
info->mask = mask;
@@ -85,6 +81,13 @@ void arm32_add_instruction(arm32_decoder_t* decoder, const char* name, const cha
8581
}
8682

8783
++decoder->instruction_count;
84+
LOG_TRACE("========================================");
85+
LOG_TRACE("Instruction Registered: %s", info->name);
86+
LOG_TRACE("Mask: 0x%08X", info->mask);
87+
LOG_TRACE("Expected: 0x%08X", info->expected);
88+
LOG_TRACE("Priority: %d", info->priority);
89+
LOG_TRACE("========================================");
90+
8891

8992
/* TODO(GloriousTacoo:jit): Add instruction to lookup table. */
9093
}
@@ -131,4 +134,5 @@ void arm32_parse_bitstring(const char* bitstring, uint32_t* mask, uint32_t* expe
131134
}
132135
}
133136
}
137+
134138
} // namespace pound::jit::decoder

src/jit/decoder/arm32.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,6 @@ void arm32_add_instruction(arm32_decoder_t* decoder, const char* name, arm32_opc
4848
arm32_handler_fn handler);
4949
void arm32_ADD_imm_handler(arm32_decoder_t* decoder, arm32_instruction_t instruction);
5050

51+
5152
} // namespace pound::jit::decoder
52-
#endif // POUND_JIT_DECODER_ARM32_H
53+
#endif // POUND_JIT_DECODER_ARM32_H

0 commit comments

Comments
 (0)