diff options
| author | Alessandro Gatti <a.gatti@frob.it> | 2025-05-22 12:20:43 +0200 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2025-06-10 11:29:02 +1000 |
| commit | 78ee1bac60a89f13d62395c1f7b6b122e26af98a (patch) | |
| tree | f574e6848b2f29517c8dde78f6f4dcf4a316a98e /py/emitnative.c | |
| parent | e43a3849d9b725f7a59dd17623193738b7ea04a5 (diff) | |
| download | micropython-78ee1bac60a89f13d62395c1f7b6b122e26af98a.tar.gz micropython-78ee1bac60a89f13d62395c1f7b6b122e26af98a.zip | |
py/emitnative: Let Viper int-indexed code use appropriate operands.
This commit extends the generic ASM API by adding the rest of the
ASM_{LOAD,STORE}[size]_REG_REG_OFFSET macros whenever applicable.
The Viper int-indexed load/store code generator was changed to use those
API functions if they are available, falling back to backend-specific
implementations if possible and ultimately to a generic implementation.
Right now all backends except for x64 implement load16, load32, and
store32 operations (x64 only implements load16).
Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
Diffstat (limited to 'py/emitnative.c')
| -rw-r--r-- | py/emitnative.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/py/emitnative.c b/py/emitnative.c index 4b470f3c93..577bcddfbf 100644 --- a/py/emitnative.c +++ b/py/emitnative.c @@ -1537,6 +1537,9 @@ static void emit_native_load_subscr(emit_t *emit) { switch (vtype_base) { case VTYPE_PTR8: { // pointer to 8-bit memory + #ifdef ASM_LOAD8_REG_REG_OFFSET + ASM_LOAD8_REG_REG_OFFSET(emit->as, REG_RET, reg_base, index_value); + #else #if N_THUMB if (index_value >= 0 && index_value < 32) { asm_thumb_ldrb_rlo_rlo_i5(emit->as, REG_RET, reg_base, index_value); @@ -1561,10 +1564,14 @@ static void emit_native_load_subscr(emit_t *emit) { reg_base = reg_index; } ASM_LOAD8_REG_REG(emit->as, REG_RET, reg_base); // load from (base+index) + #endif break; } case VTYPE_PTR16: { // pointer to 16-bit memory + #ifdef ASM_LOAD16_REG_REG_OFFSET + ASM_LOAD16_REG_REG_OFFSET(emit->as, REG_RET, reg_base, index_value); + #else #if N_THUMB if (index_value >= 0 && index_value < 32) { asm_thumb_ldrh_rlo_rlo_i5(emit->as, REG_RET, reg_base, index_value); @@ -1589,10 +1596,14 @@ static void emit_native_load_subscr(emit_t *emit) { reg_base = reg_index; } ASM_LOAD16_REG_REG(emit->as, REG_RET, reg_base); // load from (base+2*index) + #endif break; } case VTYPE_PTR32: { // pointer to 32-bit memory + #ifdef ASM_LOAD32_REG_REG_OFFSET + ASM_LOAD32_REG_REG_OFFSET(emit->as, REG_RET, reg_base, index_value); + #else #if N_THUMB if (index_value >= 0 && index_value < 32) { asm_thumb_ldr_rlo_rlo_i5(emit->as, REG_RET, reg_base, index_value); @@ -1617,6 +1628,7 @@ static void emit_native_load_subscr(emit_t *emit) { reg_base = reg_index; } ASM_LOAD32_REG_REG(emit->as, REG_RET, reg_base); // load from (base+4*index) + #endif break; } default: @@ -1809,6 +1821,9 @@ static void emit_native_store_subscr(emit_t *emit) { switch (vtype_base) { case VTYPE_PTR8: { // pointer to 8-bit memory + #ifdef ASM_STORE8_REG_REG_OFFSET + ASM_STORE8_REG_REG_OFFSET(emit->as, reg_value, reg_base, index_value); + #else // TODO optimise to use thumb strb r1, [r2, r3] #if N_THUMB if (index_value >= 0 && index_value < 32) { @@ -1837,10 +1852,14 @@ static void emit_native_store_subscr(emit_t *emit) { reg_base = reg_index; } ASM_STORE8_REG_REG(emit->as, reg_value, reg_base); // store value to (base+index) + #endif break; } case VTYPE_PTR16: { // pointer to 16-bit memory + #ifdef ASM_STORE16_REG_REG_OFFSET + ASM_STORE16_REG_REG_OFFSET(emit->as, reg_value, reg_base, index_value); + #else #if N_THUMB if (index_value >= 0 && index_value < 32) { asm_thumb_strh_rlo_rlo_i5(emit->as, reg_value, reg_base, index_value); @@ -1864,10 +1883,14 @@ static void emit_native_store_subscr(emit_t *emit) { reg_base = reg_index; } ASM_STORE16_REG_REG(emit->as, reg_value, reg_base); // store value to (base+2*index) + #endif break; } case VTYPE_PTR32: { // pointer to 32-bit memory + #ifdef ASM_STORE32_REG_REG_OFFSET + ASM_STORE32_REG_REG_OFFSET(emit->as, reg_value, reg_base, index_value); + #else #if N_THUMB if (index_value >= 0 && index_value < 32) { asm_thumb_str_rlo_rlo_i5(emit->as, reg_value, reg_base, index_value); @@ -1896,6 +1919,7 @@ static void emit_native_store_subscr(emit_t *emit) { reg_base = reg_index; } ASM_STORE32_REG_REG(emit->as, reg_value, reg_base); // store value to (base+4*index) + #endif break; } default: |