Skip to content

🔬 Load tidx for callbacks from memory #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

🔬 Load tidx for callbacks from memory #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/Primitives/arduino.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,9 +613,16 @@ def_prim(chip_ledc_attach_pin, twoToNoneU32) {

def_prim(subscribe_interrupt, threeToNoneU32) {
uint8_t pin = arg2.uint32; // GPIOPin
uint8_t tidx = arg1.uint32; // Table Idx pointing to Callback function
uint32_t tidx = arg1.uint32; // Table Idx pointing to Callback function
uint8_t mode = arg0.uint32;

uint8_t *maddr = m->memory.bytes + tidx;
if (maddr < m->memory.bytes) {
debug("subscribe_interrupt: memory access overflow\n", tidx);
return false;
}
memcpy(&tidx, maddr, 4);

dbg_info("subscribe_interrupt(%i, %i, %i)\n", pin, tidx, mode);

int index = resolve_isr(pin);
Expand Down
9 changes: 8 additions & 1 deletion src/Primitives/emulated.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,9 +440,16 @@ def_prim(write_spi_bytes_16, twoToNoneU32) {

def_prim(subscribe_interrupt, threeToNoneU32) {
uint8_t pin = arg2.uint32; // GPIOPin
uint8_t tidx = arg1.uint32; // Table Idx pointing to Callback function
uint32_t tidx = arg1.uint32; // Table Idx pointing to Callback function
uint8_t mode = arg0.uint32;

uint8_t *maddr = m->memory.bytes + tidx;
if (maddr < m->memory.bytes) {
debug("subscribe_interrupt: memory access overflow\n", tidx);
return false;
}
memcpy(&tidx, maddr, 4);

debug("EMU: subscribe_interrupt(%u, %u, %u) \n", pin, tidx, mode);

if (tidx < 0 || m->table.size < tidx) {
Expand Down