mirror of
https://github.com/pound-emu/pound.git
synced 2025-12-11 07:36:57 +00:00
Merge branch 'ramenrrami-arm64' into arm64
This commit is contained in:
commit
2e2b5df20c
2 changed files with 10 additions and 5 deletions
|
|
@ -60,14 +60,10 @@ void arm32_add_instruction(arm32_decoder_t* decoder, const char* name, const cha
|
|||
PVM_ASSERT(nullptr != bitstring);
|
||||
PVM_ASSERT(decoder->instruction_count < decoder->instruction_capacity);
|
||||
|
||||
LOG_TRACE("Adding '%s' instruction to lookup table.", name);
|
||||
arm32_opcode_t mask = 0;
|
||||
arm32_opcode_t expected = 0;
|
||||
arm32_parse_bitstring(bitstring, &mask, &expected);
|
||||
|
||||
LOG_TRACE("Mask: %x", mask);
|
||||
LOG_TRACE("Expected: %x", expected);
|
||||
|
||||
arm32_instruction_info_t* info = &decoder->instructions[decoder->instruction_count];
|
||||
info->name = name;
|
||||
info->mask = mask;
|
||||
|
|
@ -85,6 +81,13 @@ void arm32_add_instruction(arm32_decoder_t* decoder, const char* name, const cha
|
|||
}
|
||||
|
||||
++decoder->instruction_count;
|
||||
LOG_TRACE("========================================");
|
||||
LOG_TRACE("Instruction Registered: %s", info->name);
|
||||
LOG_TRACE("Mask: 0x%08X", info->mask);
|
||||
LOG_TRACE("Expected: 0x%08X", info->expected);
|
||||
LOG_TRACE("Priority: %d", info->priority);
|
||||
LOG_TRACE("========================================");
|
||||
|
||||
|
||||
/* TODO(GloriousTacoo:jit): Add instruction to lookup table. */
|
||||
}
|
||||
|
|
@ -131,4 +134,5 @@ void arm32_parse_bitstring(const char* bitstring, uint32_t* mask, uint32_t* expe
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace pound::jit::decoder
|
||||
|
|
|
|||
|
|
@ -48,5 +48,6 @@ void arm32_add_instruction(arm32_decoder_t* decoder, const char* name, arm32_opc
|
|||
arm32_handler_fn handler);
|
||||
void arm32_ADD_imm_handler(arm32_decoder_t* decoder, arm32_instruction_t instruction);
|
||||
|
||||
|
||||
} // namespace pound::jit::decoder
|
||||
#endif // POUND_JIT_DECODER_ARM32_H
|
||||
#endif // POUND_JIT_DECODER_ARM32_H
|
||||
Loading…
Add table
Add a link
Reference in a new issue