haui/InfiniTime_mirror
1
0
Fork 1
mirror of https://github.com/InfiniTimeOrg/InfiniTime.git synced 2024-10-22 15:11:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup

Browse source
This commit is contained in:
Felipe Martinez 2024-07-08 00:53:17 +00:00
parent 2adeb39800
commit db53157c21
2 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/displayapp/screens/ASM.cpp
View file

@ -8,8 +8,6 @@
using namespace Pinetime::Applications::Screens;
#define u16(n) (n) >> 8, (n) & 0xFF
ASM::ASM(Controllers::DateTime& dateTimeController) : dateTimeController(dateTimeController) {
this->code = out_bin;
this->code_len = out_bin_len;
@ -26,32 +24,16 @@ ASM::~ASM() {
// lv_obj_clean(lv_scr_act());
}
uint8_t ASM::read_byte(size_t pos) {
return code[pos];
}
uint16_t ASM::read_u16(size_t pos) {
return static_cast<uint16_t>(code[pos + 1] << 8 | code[pos]);
}
uint32_t ASM::read_u24(size_t pos) {
return static_cast<uint32_t>(code[pos + 2] << 16 | code[pos + 1] << 8 | code[pos]);
}
uint32_t ASM::read_u32(size_t pos) {
return static_cast<uint32_t>(code[pos + 3] << 24 | code[pos + 2] << 16 | code[pos + 1] << 8 | code[pos]);
}
void ASM::run() {
for (;;) {
if (pc >= code_len) {
break;
}
OpcodeShort opcode = static_cast<OpcodeShort>(code[pc]);
OpcodeShort opcode = static_cast<OpcodeShort>(read_byte(pc));
if (opcode & (1 << 7)) {
// Long opcode
OpcodeLong opcode = static_cast<OpcodeLong>(code[pc] << 8 | code[pc + 1]);
OpcodeLong opcode = static_cast<OpcodeLong>(read_u16(pc));
NRF_LOG_INFO("Long opcode: %d", opcode);

19
src/displayapp/screens/ASM.h
View file

@ -128,10 +128,21 @@ namespace Pinetime {
enum OpcodeLong : uint16_t {};
uint8_t read_byte(size_t pos);
uint16_t read_u16(size_t pos);
uint32_t read_u24(size_t pos);
uint32_t read_u32(size_t pos);
uint8_t read_byte(size_t pos) {
return code[pos];
}
uint16_t read_u16(size_t pos) {
return static_cast<uint16_t>(code[pos + 1] << 8 | code[pos]);
}
uint32_t read_u24(size_t pos) {
return static_cast<uint32_t>(code[pos + 2] << 16 | code[pos + 1] << 8 | code[pos]);
}
uint32_t read_u32(size_t pos) {
return static_cast<uint32_t>(code[pos + 3] << 24 | code[pos + 2] << 16 | code[pos + 1] << 8 | code[pos]);
}
uint8_t* code;
size_t code_len;