Skip to content

Commit c290ee3

Browse files
thejpsterthejpster
committed
Don't print function addresses in interrupt example
Functions move around in memory according to the linker's whims.
1 parent 4672877 commit c290ee3

10 files changed

+0
-127
lines changed

‎examples/versatileab/reference/interrupt-armv4t-none-eabi.out‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
11
Setting up interrupts...
2-
00 0x00000000 Ctrl { enabled=0, id=0 }
3-
01 0x00000000 Ctrl { enabled=0, id=0 }
4-
02 0x00000000 Ctrl { enabled=0, id=0 }
5-
03 0x00000000 Ctrl { enabled=0, id=0 }
6-
04 0x0000087c Ctrl { enabled=1, id=2 }
7-
05 0x00000000 Ctrl { enabled=0, id=0 }
8-
06 0x00000000 Ctrl { enabled=0, id=0 }
9-
07 0x0000079c Ctrl { enabled=1, id=1 }
10-
08 0x00000000 Ctrl { enabled=0, id=0 }
11-
09 0x00000000 Ctrl { enabled=0, id=0 }
12-
10 0x00000000 Ctrl { enabled=0, id=0 }
13-
11 0x00000000 Ctrl { enabled=0, id=0 }
14-
12 0x00000000 Ctrl { enabled=0, id=0 }
15-
13 0x00000000 Ctrl { enabled=0, id=0 }
16-
14 0x00000000 Ctrl { enabled=0, id=0 }
17-
15 0x00000000 Ctrl { enabled=0, id=0 }
182
Firing interrupt...
193
> interrupt_handler()
204
> soft_handler1()

‎examples/versatileab/reference/interrupt-armv5te-none-eabi.out‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
11
Setting up interrupts...
2-
00 0x00000000 Ctrl { enabled=0, id=0 }
3-
01 0x00000000 Ctrl { enabled=0, id=0 }
4-
02 0x00000000 Ctrl { enabled=0, id=0 }
5-
03 0x00000000 Ctrl { enabled=0, id=0 }
6-
04 0x0000040c Ctrl { enabled=1, id=2 }
7-
05 0x00000000 Ctrl { enabled=0, id=0 }
8-
06 0x00000000 Ctrl { enabled=0, id=0 }
9-
07 0x00000330 Ctrl { enabled=1, id=1 }
10-
08 0x00000000 Ctrl { enabled=0, id=0 }
11-
09 0x00000000 Ctrl { enabled=0, id=0 }
12-
10 0x00000000 Ctrl { enabled=0, id=0 }
13-
11 0x00000000 Ctrl { enabled=0, id=0 }
14-
12 0x00000000 Ctrl { enabled=0, id=0 }
15-
13 0x00000000 Ctrl { enabled=0, id=0 }
16-
14 0x00000000 Ctrl { enabled=0, id=0 }
17-
15 0x00000000 Ctrl { enabled=0, id=0 }
182
Firing interrupt...
193
> interrupt_handler()
204
> soft_handler1()

‎examples/versatileab/reference/interrupt-armv7a-none-eabi.out‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
11
Setting up interrupts...
2-
00 0x00000000 Ctrl { enabled=0, id=0 }
3-
01 0x00000000 Ctrl { enabled=0, id=0 }
4-
02 0x00000000 Ctrl { enabled=0, id=0 }
5-
03 0x00000000 Ctrl { enabled=0, id=0 }
6-
04 0x00000154 Ctrl { enabled=1, id=2 }
7-
05 0x00000000 Ctrl { enabled=0, id=0 }
8-
06 0x00000000 Ctrl { enabled=0, id=0 }
9-
07 0x00000078 Ctrl { enabled=1, id=1 }
10-
08 0x00000000 Ctrl { enabled=0, id=0 }
11-
09 0x00000000 Ctrl { enabled=0, id=0 }
12-
10 0x00000000 Ctrl { enabled=0, id=0 }
13-
11 0x00000000 Ctrl { enabled=0, id=0 }
14-
12 0x00000000 Ctrl { enabled=0, id=0 }
15-
13 0x00000000 Ctrl { enabled=0, id=0 }
16-
14 0x00000000 Ctrl { enabled=0, id=0 }
17-
15 0x00000000 Ctrl { enabled=0, id=0 }
182
Firing interrupt...
193
> interrupt_handler()
204
> soft_handler1()

‎examples/versatileab/reference/interrupt-armv7a-none-eabihf-dp.out‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
11
Setting up interrupts...
2-
00 0x00000000 Ctrl { enabled=0, id=0 }
3-
01 0x00000000 Ctrl { enabled=0, id=0 }
4-
02 0x00000000 Ctrl { enabled=0, id=0 }
5-
03 0x00000000 Ctrl { enabled=0, id=0 }
6-
04 0x0000022c Ctrl { enabled=1, id=2 }
7-
05 0x00000000 Ctrl { enabled=0, id=0 }
8-
06 0x00000000 Ctrl { enabled=0, id=0 }
9-
07 0x00000150 Ctrl { enabled=1, id=1 }
10-
08 0x00000000 Ctrl { enabled=0, id=0 }
11-
09 0x00000000 Ctrl { enabled=0, id=0 }
12-
10 0x00000000 Ctrl { enabled=0, id=0 }
13-
11 0x00000000 Ctrl { enabled=0, id=0 }
14-
12 0x00000000 Ctrl { enabled=0, id=0 }
15-
13 0x00000000 Ctrl { enabled=0, id=0 }
16-
14 0x00000000 Ctrl { enabled=0, id=0 }
17-
15 0x00000000 Ctrl { enabled=0, id=0 }
182
Firing interrupt...
193
> interrupt_handler()
204
> soft_handler1()

‎examples/versatileab/reference/interrupt-armv7a-none-eabihf.out‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
11
Setting up interrupts...
2-
00 0x00000000 Ctrl { enabled=0, id=0 }
3-
01 0x00000000 Ctrl { enabled=0, id=0 }
4-
02 0x00000000 Ctrl { enabled=0, id=0 }
5-
03 0x00000000 Ctrl { enabled=0, id=0 }
6-
04 0x00000680 Ctrl { enabled=1, id=2 }
7-
05 0x00000000 Ctrl { enabled=0, id=0 }
8-
06 0x00000000 Ctrl { enabled=0, id=0 }
9-
07 0x000005a4 Ctrl { enabled=1, id=1 }
10-
08 0x00000000 Ctrl { enabled=0, id=0 }
11-
09 0x00000000 Ctrl { enabled=0, id=0 }
12-
10 0x00000000 Ctrl { enabled=0, id=0 }
13-
11 0x00000000 Ctrl { enabled=0, id=0 }
14-
12 0x00000000 Ctrl { enabled=0, id=0 }
15-
13 0x00000000 Ctrl { enabled=0, id=0 }
16-
14 0x00000000 Ctrl { enabled=0, id=0 }
17-
15 0x00000000 Ctrl { enabled=0, id=0 }
182
Firing interrupt...
193
> interrupt_handler()
204
> soft_handler1()

‎examples/versatileab/reference/interrupt-armv7r-none-eabi.out‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
11
Setting up interrupts...
2-
00 0x00000000 Ctrl { enabled=0, id=0 }
3-
01 0x00000000 Ctrl { enabled=0, id=0 }
4-
02 0x00000000 Ctrl { enabled=0, id=0 }
5-
03 0x00000000 Ctrl { enabled=0, id=0 }
6-
04 0x000009a8 Ctrl { enabled=1, id=2 }
7-
05 0x00000000 Ctrl { enabled=0, id=0 }
8-
06 0x00000000 Ctrl { enabled=0, id=0 }
9-
07 0x000008cc Ctrl { enabled=1, id=1 }
10-
08 0x00000000 Ctrl { enabled=0, id=0 }
11-
09 0x00000000 Ctrl { enabled=0, id=0 }
12-
10 0x00000000 Ctrl { enabled=0, id=0 }
13-
11 0x00000000 Ctrl { enabled=0, id=0 }
14-
12 0x00000000 Ctrl { enabled=0, id=0 }
15-
13 0x00000000 Ctrl { enabled=0, id=0 }
16-
14 0x00000000 Ctrl { enabled=0, id=0 }
17-
15 0x00000000 Ctrl { enabled=0, id=0 }
182
Firing interrupt...
193
> interrupt_handler()
204
> soft_handler1()

‎examples/versatileab/reference/interrupt-armv7r-none-eabihf.out‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
11
Setting up interrupts...
2-
00 0x00000000 Ctrl { enabled=0, id=0 }
3-
01 0x00000000 Ctrl { enabled=0, id=0 }
4-
02 0x00000000 Ctrl { enabled=0, id=0 }
5-
03 0x00000000 Ctrl { enabled=0, id=0 }
6-
04 0x00000b08 Ctrl { enabled=1, id=2 }
7-
05 0x00000000 Ctrl { enabled=0, id=0 }
8-
06 0x00000000 Ctrl { enabled=0, id=0 }
9-
07 0x00000a2c Ctrl { enabled=1, id=1 }
10-
08 0x00000000 Ctrl { enabled=0, id=0 }
11-
09 0x00000000 Ctrl { enabled=0, id=0 }
12-
10 0x00000000 Ctrl { enabled=0, id=0 }
13-
11 0x00000000 Ctrl { enabled=0, id=0 }
14-
12 0x00000000 Ctrl { enabled=0, id=0 }
15-
13 0x00000000 Ctrl { enabled=0, id=0 }
16-
14 0x00000000 Ctrl { enabled=0, id=0 }
17-
15 0x00000000 Ctrl { enabled=0, id=0 }
182
Firing interrupt...
193
> interrupt_handler()
204
> soft_handler1()

‎examples/versatileab/reference/interrupt-thumbv4t-none-eabi.out‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎examples/versatileab/reference/interrupt-thumbv5te-none-eabi.out‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎examples/versatileab/src/bin/interrupt.rs‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,6 @@ fn my_main() -> ! {
4343
PL190.enable_interrupt(TEST_INTERRUPT2);
4444
PL190.enable_interrupt(TEST_INTERRUPT3);
4545

46-
for i in 0..Pl190Driver::NUM_VECTORS {
47-
let addr = PL190
48-
.get_addr_for_vector(VectorId::new(i))
49-
.map(|handler| handler as usize)
50-
.unwrap_or(0);
51-
let ctrl = PL190.get_ctrl_for_vector(VectorId::new(i));
52-
println!("{i:02} 0x{addr:08x} {ctrl:?}");
53-
}
54-
5546
println!("Firing interrupt...");
5647
PL190.pend_sw_interrupt(TEST_INTERRUPT1);
5748

0 commit comments

Comments
 (0)