abdul124/artiq-zynq
1
0
Fork 0
forked from M-Labs/artiq-zynq
Code Pull Requests Activity

Compare commits

base: abdul124:a7dbfe506e53e201e3f3a575fb9fd5b91c1d3810
Branches Tags
abdul124:master
abdul124:release-8
abdul124:release-7
abdul124:sync_exceptions
abdul124:lock_makefile
abdul124:remove_redundant_unsafe
abdul124:refactor_nalgebra
abdul124:add_linalg_functions
abdul124:release-6
M-Labs:master
M-Labs:release-7
M-Labs:release-8
M-Labs:release-6
...
compare: abdul124:e042a7868d75b3981de287900088b6bb2e83f130
Branches Tags
abdul124:master
abdul124:release-8
abdul124:release-7
abdul124:sync_exceptions
abdul124:lock_makefile
abdul124:remove_redundant_unsafe
abdul124:refactor_nalgebra
abdul124:add_linalg_functions
abdul124:release-6
M-Labs:master
M-Labs:release-7
M-Labs:release-8
M-Labs:release-6

2 Commits
a7dbfe506e ... e042a7868d

Author SHA1 Message Date
abdul124
e042a7868d firware: restore exception id order 2024-08-23 12:27:57 +08:00
Sebastien Bourdeauducq
0005508f83 flake: update dependencies 2024-08-21 18:58:35 +08:00
2 changed files with 19 additions and 27 deletions
Show Stats Expand all files Collapse all files

16
flake.lock generated
View File

@ -11,11 +11,11 @@
"src-pythonparser": "src-pythonparser" "src-pythonparser": "src-pythonparser"
}, },
"locked": { "locked": {
"lastModified": 1717642968, "lastModified": 1724210862,
"narHash": "sha256-4t+Z1kbObauE0OiofvM9ZSHghqDvMgqmcrnCEQR1kqc=", "narHash": "sha256-D1WN3MkmlQtuk0eM3PWwaq55SegdIxHXNtXlyFcSMoM=",
"ref": "release-7", "ref": "release-7",
"rev": "c81280174c6e6bd11ce4b6043811f7030f0f5b0c", "rev": "70c2ca58af171dbacad3ffb1f6dd3d6d313c5e8c",
"revCount": 8193, "revCount": 8205,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/artiq.git" "url": "https://github.com/m-labs/artiq.git"
}, },
@ -235,11 +235,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717654016, "lastModified": 1720537402,
"narHash": "sha256-y/c0EZNDNlxb/yLy/D23X9PLoiQ8I9mXAA0zsVOy2t8=", "narHash": "sha256-ybvaQ48SVBqYVqgYmGUdefGZkni7PJ90qYQPHnFOwDs=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "0efbbe39fe643c03f15e29c208bff3247a987766", "rev": "b2b3e5c933cbc4b7cb14adde480d7561a3ae71ee",
"revCount": 647, "revCount": 648,
"type": "git", "type": "git",
"url": "https://git.m-labs.hk/m-labs/zynq-rs" "url": "https://git.m-labs.hk/m-labs/zynq-rs"
}, },

30
src/runtime/src/eh_artiq.rs
View File

@ -404,26 +404,18 @@ extern fn stop_fn(_version: c_int,
} }
// Must be kept in sync with preallocate_runtime_exception_names() in `artiq.compiler.embedding` // Must be kept in sync with preallocate_runtime_exception_names() in `artiq.compiler.embedding`
static EXCEPTION_ID_LOOKUP: [(&str, u32); 19] = [ static EXCEPTION_ID_LOOKUP: [(&str, u32); 11] = [
("RTIOUnderflow", 0), ("RuntimeError", 0),
("RTIOOverflow", 1), ("RTIOUnderflow", 1),
("RTIODestinationUnreachable", 2), ("RTIOOverflow", 2),
("DMAError", 3), ("RTIODestinationUnreachable", 3),
("I2CError", 4), ("DMAError", 4),
("CacheError", 5), ("I2CError", 5),
("SPIError", 6), ("CacheError", 6),
("AssertionError", 7), ("SPIError", 7),
("AttributeError", 8), ("ZeroDivisionError", 8),
("IndexError", 9), ("IndexError", 9),
("IOError", 10), ("UnwrapNoneError", 10),
("KeyError", 11),
("NotImplementedError", 12),
("OverflowError", 13),
("RuntimeError", 14),
("TimeoutError", 15),
("TypeError", 16),
("ValueError", 17),
("ZeroDivisionError", 18),
]; ];
pub fn get_exception_id(name: &str) -> u32 { pub fn get_exception_id(name: &str) -> u32 {