TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py/emitinlinextensa: Simplify register name lookup.

Browse Source 
This commit changes the Xtensa inline assembly parser to use a slightly
simpler (and probably a tiny bit more efficient) way to look up register
names when decoding instruction parameters.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
This commit is contained in:
Alessandro Gatti
2025-01-28 14:58:29 +01:00
committed by Damien George
parent 8633abc082
commit 50fab08e6b
1 changed files with 10 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
py/emitinlinextensa.c
View File

@@ -115,50 +115,21 @@ static bool emit_inline_xtensa_label(emit_inline_asm_t *emit, mp_uint_t label_nu
return true; return true;
} }
typedef struct _reg_name_t { byte reg; static const qstr_short_t REGISTERS[16] = {
byte name[3]; MP_QSTR_a0, MP_QSTR_a1, MP_QSTR_a2, MP_QSTR_a3, MP_QSTR_a4, MP_QSTR_a5, MP_QSTR_a6, MP_QSTR_a7,
} reg_name_t; MP_QSTR_a8, MP_QSTR_a9, MP_QSTR_a10, MP_QSTR_a11, MP_QSTR_a12, MP_QSTR_a13, MP_QSTR_a14, MP_QSTR_a15
static const reg_name_t reg_name_table[] = {
{0, "a0\0"},
{1, "a1\0"},
{2, "a2\0"},
{3, "a3\0"},
{4, "a4\0"},
{5, "a5\0"},
{6, "a6\0"},
{7, "a7\0"},
{8, "a8\0"},
{9, "a9\0"},
{10, "a10"},
{11, "a11"},
{12, "a12"},
{13, "a13"},
{14, "a14"},
{15, "a15"},
}; };
// return empty string in case of error, so we can attempt to parse the string
// without a special check if it was in fact a string
static const char *get_arg_str(mp_parse_node_t pn) {
if (MP_PARSE_NODE_IS_ID(pn)) {
qstr qst = MP_PARSE_NODE_LEAF_ARG(pn);
return qstr_str(qst);
} else {
return "";
}
}
static mp_uint_t get_arg_reg(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn) { static mp_uint_t get_arg_reg(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn) {
const char *reg_str = get_arg_str(pn); if (MP_PARSE_NODE_IS_ID(pn)) {
for (mp_uint_t i = 0; i < MP_ARRAY_SIZE(reg_name_table); i++) { qstr node_qstr = MP_PARSE_NODE_LEAF_ARG(pn);
const reg_name_t *r = &reg_name_table[i]; for (size_t i = 0; i < MP_ARRAY_SIZE(REGISTERS); i++) {
if (reg_str[0] == r->name[0] if (node_qstr == REGISTERS[i]) {
&& reg_str[1] == r->name[1] return i;
&& reg_str[2] == r->name[2] }
&& (reg_str[2] == '\0' || reg_str[3] == '\0')) {
return r->reg;
} }
} }
emit_inline_xtensa_error_exc(emit, emit_inline_xtensa_error_exc(emit,
mp_obj_new_exception_msg_varg(&mp_type_SyntaxError, mp_obj_new_exception_msg_varg(&mp_type_SyntaxError,
MP_ERROR_TEXT("'%s' expects a register"), op)); MP_ERROR_TEXT("'%s' expects a register"), op));