Skip to content

Commit 52cbe38

Browse files
committed
testsuite/test-code-or1k: Rename excpt_break to excpt_fpu
Preparing to make some FPU exception tests, the old excpt_break vector is incorrectly named to fix the name can call it excpt_fpu.
1 parent 7a03376 commit 52cbe38

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

testsuite/test-code-or1k/except-test/except-test-s.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ stack:
6666
.extern excpt_itlbmiss
6767
.extern excpt_range
6868
.extern excpt_syscall
69-
.extern excpt_break
69+
.extern excpt_fpu
7070
.extern excpt_trap
7171

7272
/* Our special text section is used to guarantee this code goes first
@@ -334,14 +334,14 @@ syscall_vector:
334334
l.addi r3,r3,8
335335

336336
.org 0xd00
337-
break_vector:
337+
fpu_vector:
338338
l.addi r1,r1,-120
339339
l.sw 0x1c(r1),r9
340340
l.sw 0x20(r1),r10
341341
l.movhi r9,hi(store_regs)
342342
l.ori r9,r9,lo(store_regs)
343-
l.movhi r10,hi(excpt_break)
344-
l.ori r10,r10,lo(excpt_break)
343+
l.movhi r10,hi(excpt_fpu)
344+
l.ori r10,r10,lo(excpt_fpu)
345345
l.jr r9
346346
l.nop
347347
l.nop

testsuite/test-code-or1k/except-test/except-test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ extern unsigned long excpt_dtlbmiss;
143143
extern unsigned long excpt_itlbmiss;
144144
extern unsigned long excpt_range;
145145
extern unsigned long excpt_syscall;
146-
extern unsigned long excpt_break;
146+
extern unsigned long excpt_fpu;
147147
extern unsigned long excpt_trap;
148148

149149

testsuite/test-code-or1k/except/except.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ stack:
5151
.extern excpt_itlbmiss
5252
.extern excpt_range
5353
.extern excpt_syscall
54-
.extern excpt_break
54+
.extern excpt_fpu
5555
.extern excpt_trap
5656

5757
.section .except,"ax"
@@ -235,15 +235,15 @@ syscall_vector:
235235
OR1K_DELAYED_NOP(OR1K_INST(l.jr r10))
236236

237237
.org 0xd00
238-
break_vector:
238+
fpu_vector:
239239
l.addi r1,r1,-EXCEPT_STACK_SIZE
240240
l.sw 0x18(r1),r9
241241
OR1K_DELAYED_NOP(OR1K_INST(l.jal store_regs))
242242
l.nop
243243
l.movhi r9,hi(end_except)
244244
l.ori r9,r9,lo(end_except)
245-
l.movhi r10,hi(excpt_break)
246-
l.ori r10,r10,lo(excpt_break)
245+
l.movhi r10,hi(excpt_fpu)
246+
l.ori r10,r10,lo(excpt_fpu)
247247
l.lwz r10,0(r10)
248248
OR1K_DELAYED_NOP(OR1K_INST(l.jr r10))
249249

testsuite/test-code-or1k/mc-common/except-mc.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ stack:
4848
.extern excpt_itlbmiss
4949
.extern excpt_range
5050
.extern excpt_syscall
51-
.extern excpt_break
51+
.extern excpt_fpu
5252
.extern excpt_trap
5353

5454
.section .except,"ax"
@@ -264,14 +264,14 @@ syscall_vector:
264264
OR1K_DELAYED_NOP(OR1K_INST(l.jr r10))
265265

266266
.org 0xd00
267-
break_vector:
267+
fpu_vector:
268268
l.addi r1,r1,-116
269269
l.sw 0x18(r1),r9
270270
OR1K_DELAYED_NOP(OR1K_INST(l.jal store_regs))
271271
l.movhi r9,hi(end_except)
272272
l.ori r9,r9,lo(end_except)
273-
l.movhi r10,hi(excpt_break)
274-
l.ori r10,r10,lo(excpt_break)
273+
l.movhi r10,hi(excpt_fpu)
274+
l.ori r10,r10,lo(excpt_fpu)
275275
l.lwz r10,0(r10)
276276
OR1K_DELAYED_NOP(OR1K_INST(l.jr r10))
277277

testsuite/test-code-or1k/support/support.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ unsigned long excpt_dtlbmiss = (unsigned long) excpt_dummy;
4848
unsigned long excpt_itlbmiss = (unsigned long) excpt_dummy;
4949
unsigned long excpt_range = (unsigned long) excpt_dummy;
5050
unsigned long excpt_syscall = (unsigned long) excpt_dummy;
51-
unsigned long excpt_break = (unsigned long) excpt_dummy;
51+
unsigned long excpt_fpu = (unsigned long) excpt_dummy;
5252
unsigned long excpt_trap = (unsigned long) excpt_dummy;
5353

5454

testsuite/test-code-or1k/support/support.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ extern unsigned long int excpt_dtlbmiss;
9090
extern unsigned long int excpt_itlbmiss;
9191
extern unsigned long int excpt_range;
9292
extern unsigned long int excpt_syscall;
93-
extern unsigned long int excpt_break;
93+
extern unsigned long int excpt_fpu;
9494
extern unsigned long int excpt_trap;
9595

9696
#endif

0 commit comments

Comments
 (0)