Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ee1ef551bc85
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d1319b83e5ea
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 10, 2016

  1. Inject parameters into coredevice exception message when mapping.

    whitequark committed Jan 10, 2016
    Copy the full SHA
    b669e83 View commit details

  2. runtime: properly format addresses in InternalError message.

    whitequark committed Jan 10, 2016
    Copy the full SHA
    d1319b8 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 artiq/coredevice/comm_generic.py
  2. +1 −1 artiq/runtime/ksupport.c
2 changes: 1 addition & 1 deletion artiq/coredevice/comm_generic.py
View file
Original file line number Diff line number Diff line change
@@ -512,7 +512,7 @@ def _serve_exception(self, object_map, symbolizer):
assert exception.id != 0
python_exn_type = object_map.retrieve(exception.id)

python_exn = python_exn_type(message)
python_exn = python_exn_type(message.format(*params))
python_exn.artiq_exception = exception
raise python_exn

2 changes: 1 addition & 1 deletion artiq/runtime/ksupport.c
View file
Original file line number Diff line number Diff line change
@@ -225,7 +225,7 @@ void exception_handler(unsigned long vect, unsigned long *regs,
unsigned long pc, unsigned long ea)
{
artiq_raise_from_c("InternalError",
"Hardware exception {0} at PC {1}, EA {2}",
"Hardware exception {0} at PC 0x{1:08x}, EA 0x{2:08x}",
vect, pc, ea);
}