diff --git a/src/test/cpp/raw/deleg/build/deleg.asm b/src/test/cpp/raw/deleg/build/deleg.asm
index 9e3098f..e64c374 100644
--- a/src/test/cpp/raw/deleg/build/deleg.asm
+++ b/src/test/cpp/raw/deleg/build/deleg.asm
@@ -6,536 +6,744 @@ Disassembly of section .crt_section:
 
 80000000 <_start>:
 80000000:	00100e93          	li	t4,1
-80000004:	00000097          	auipc	ra,0x0
-80000008:	6fc08093          	addi	ra,ra,1788 # 80000700 <mtrap>
+80000004:	00001097          	auipc	ra,0x1
+80000008:	a3c08093          	addi	ra,ra,-1476 # 80000a40 <mtrap>
 8000000c:	30509073          	csrw	mtvec,ra
-80000010:	00000097          	auipc	ra,0x0
-80000014:	72808093          	addi	ra,ra,1832 # 80000738 <strap>
+80000010:	00001097          	auipc	ra,0x1
+80000014:	a6808093          	addi	ra,ra,-1432 # 80000a78 <strap>
 80000018:	10509073          	csrw	stvec,ra
 8000001c:	f00110b7          	lui	ra,0xf0011
 80000020:	00000113          	li	sp,0
-80000024:	0020a023          	sw	sp,0(ra) # f0011000 <strap+0x700108c8>
+80000024:	0020a023          	sw	sp,0(ra) # f0011000 <strap+0x70010588>
+80000028:	00000013          	nop
+8000002c:	00000013          	nop
+80000030:	00000013          	nop
+80000034:	00000013          	nop
+80000038:	00000013          	nop
+8000003c:	00000013          	nop
+80000040:	00000013          	nop
+80000044:	00000013          	nop
 
-80000028 <test1>:
-80000028:	00100e13          	li	t3,1
-8000002c:	00000f17          	auipc	t5,0x0
-80000030:	00cf0f13          	addi	t5,t5,12 # 80000038 <test2>
-80000034:	00000073          	ecall
+80000048 <test1>:
+80000048:	00100e13          	li	t3,1
+8000004c:	00000f17          	auipc	t5,0x0
+80000050:	00cf0f13          	addi	t5,t5,12 # 80000058 <test2>
+80000054:	00000073          	ecall
 
-80000038 <test2>:
-80000038:	00200e13          	li	t3,2
-8000003c:	000020b7          	lui	ra,0x2
-80000040:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
-80000044:	00000113          	li	sp,0
-80000048:	3000b073          	csrc	mstatus,ra
-8000004c:	30012073          	csrs	mstatus,sp
-80000050:	00000097          	auipc	ra,0x0
-80000054:	01408093          	addi	ra,ra,20 # 80000064 <test2+0x2c>
-80000058:	34109073          	csrw	mepc,ra
-8000005c:	30200073          	mret
-80000060:	6880006f          	j	800006e8 <fail>
-80000064:	00000f17          	auipc	t5,0x0
-80000068:	024f0f13          	addi	t5,t5,36 # 80000088 <test4>
-8000006c:	00000073          	ecall
-80000070:	6780006f          	j	800006e8 <fail>
+80000058 <test2>:
+80000058:	00200e13          	li	t3,2
+8000005c:	000020b7          	lui	ra,0x2
+80000060:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
+80000064:	00000113          	li	sp,0
+80000068:	3000b073          	csrc	mstatus,ra
+8000006c:	30012073          	csrs	mstatus,sp
+80000070:	00000097          	auipc	ra,0x0
+80000074:	01408093          	addi	ra,ra,20 # 80000084 <test2+0x2c>
+80000078:	34109073          	csrw	mepc,ra
+8000007c:	30200073          	mret
+80000080:	1a90006f          	j	80000a28 <fail>
+80000084:	00000f17          	auipc	t5,0x0
+80000088:	024f0f13          	addi	t5,t5,36 # 800000a8 <test4>
+8000008c:	00000073          	ecall
+80000090:	1990006f          	j	80000a28 <fail>
 
-80000074 <test3>:
-80000074:	00300e13          	li	t3,3
-80000078:	00000f17          	auipc	t5,0x0
-8000007c:	010f0f13          	addi	t5,t5,16 # 80000088 <test4>
-80000080:	00102083          	lw	ra,1(zero) # 1 <_start-0x7fffffff>
-80000084:	6640006f          	j	800006e8 <fail>
+80000094 <test3>:
+80000094:	00300e13          	li	t3,3
+80000098:	00000f17          	auipc	t5,0x0
+8000009c:	010f0f13          	addi	t5,t5,16 # 800000a8 <test4>
+800000a0:	00102083          	lw	ra,1(zero) # 1 <_start-0x7fffffff>
+800000a4:	1850006f          	j	80000a28 <fail>
 
-80000088 <test4>:
-80000088:	00400e13          	li	t3,4
-8000008c:	000020b7          	lui	ra,0x2
-80000090:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
-80000094:	00001137          	lui	sp,0x1
-80000098:	80010113          	addi	sp,sp,-2048 # 800 <_start-0x7ffff800>
-8000009c:	3000b073          	csrc	mstatus,ra
-800000a0:	30012073          	csrs	mstatus,sp
-800000a4:	00000097          	auipc	ra,0x0
-800000a8:	01408093          	addi	ra,ra,20 # 800000b8 <test4+0x30>
-800000ac:	34109073          	csrw	mepc,ra
-800000b0:	30200073          	mret
-800000b4:	6340006f          	j	800006e8 <fail>
-800000b8:	00000f17          	auipc	t5,0x0
-800000bc:	010f0f13          	addi	t5,t5,16 # 800000c8 <test5>
-800000c0:	00102083          	lw	ra,1(zero) # 1 <_start-0x7fffffff>
-800000c4:	6240006f          	j	800006e8 <fail>
+800000a8 <test4>:
+800000a8:	00400e13          	li	t3,4
+800000ac:	000020b7          	lui	ra,0x2
+800000b0:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
+800000b4:	00001137          	lui	sp,0x1
+800000b8:	80010113          	addi	sp,sp,-2048 # 800 <_start-0x7ffff800>
+800000bc:	3000b073          	csrc	mstatus,ra
+800000c0:	30012073          	csrs	mstatus,sp
+800000c4:	00000097          	auipc	ra,0x0
+800000c8:	01408093          	addi	ra,ra,20 # 800000d8 <test4+0x30>
+800000cc:	34109073          	csrw	mepc,ra
+800000d0:	30200073          	mret
+800000d4:	1550006f          	j	80000a28 <fail>
+800000d8:	00000f17          	auipc	t5,0x0
+800000dc:	010f0f13          	addi	t5,t5,16 # 800000e8 <test5>
+800000e0:	00102083          	lw	ra,1(zero) # 1 <_start-0x7fffffff>
+800000e4:	1450006f          	j	80000a28 <fail>
 
-800000c8 <test5>:
-800000c8:	00500e13          	li	t3,5
-800000cc:	000020b7          	lui	ra,0x2
-800000d0:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
-800000d4:	00000113          	li	sp,0
-800000d8:	3000b073          	csrc	mstatus,ra
-800000dc:	30012073          	csrs	mstatus,sp
-800000e0:	00000097          	auipc	ra,0x0
-800000e4:	01408093          	addi	ra,ra,20 # 800000f4 <test5+0x2c>
-800000e8:	34109073          	csrw	mepc,ra
-800000ec:	30200073          	mret
-800000f0:	5f80006f          	j	800006e8 <fail>
-800000f4:	00000f17          	auipc	t5,0x0
-800000f8:	010f0f13          	addi	t5,t5,16 # 80000104 <test6>
-800000fc:	00102083          	lw	ra,1(zero) # 1 <_start-0x7fffffff>
-80000100:	5e80006f          	j	800006e8 <fail>
-
-80000104 <test6>:
-80000104:	00600e13          	li	t3,6
-80000108:	01000093          	li	ra,16
-8000010c:	30209073          	csrw	medeleg,ra
-
-80000110 <test7>:
-80000110:	00700e13          	li	t3,7
+800000e8 <test5>:
+800000e8:	00500e13          	li	t3,5
+800000ec:	000020b7          	lui	ra,0x2
+800000f0:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
+800000f4:	00000113          	li	sp,0
+800000f8:	3000b073          	csrc	mstatus,ra
+800000fc:	30012073          	csrs	mstatus,sp
+80000100:	00000097          	auipc	ra,0x0
+80000104:	01408093          	addi	ra,ra,20 # 80000114 <test5+0x2c>
+80000108:	34109073          	csrw	mepc,ra
+8000010c:	30200073          	mret
+80000110:	1190006f          	j	80000a28 <fail>
 80000114:	00000f17          	auipc	t5,0x0
-80000118:	010f0f13          	addi	t5,t5,16 # 80000124 <test8>
+80000118:	010f0f13          	addi	t5,t5,16 # 80000124 <test6>
 8000011c:	00102083          	lw	ra,1(zero) # 1 <_start-0x7fffffff>
-80000120:	5c80006f          	j	800006e8 <fail>
+80000120:	1090006f          	j	80000a28 <fail>
 
-80000124 <test8>:
-80000124:	00800e13          	li	t3,8
-80000128:	00000f17          	auipc	t5,0x0
-8000012c:	03cf0f13          	addi	t5,t5,60 # 80000164 <test9>
-80000130:	000020b7          	lui	ra,0x2
-80000134:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
-80000138:	00001137          	lui	sp,0x1
-8000013c:	80010113          	addi	sp,sp,-2048 # 800 <_start-0x7ffff800>
-80000140:	3000b073          	csrc	mstatus,ra
-80000144:	30012073          	csrs	mstatus,sp
-80000148:	00000097          	auipc	ra,0x0
-8000014c:	01408093          	addi	ra,ra,20 # 8000015c <test8+0x38>
-80000150:	34109073          	csrw	mepc,ra
-80000154:	30200073          	mret
-80000158:	5900006f          	j	800006e8 <fail>
-8000015c:	00102083          	lw	ra,1(zero) # 1 <_start-0x7fffffff>
-80000160:	5880006f          	j	800006e8 <fail>
+80000124 <test6>:
+80000124:	00600e13          	li	t3,6
+80000128:	01000093          	li	ra,16
+8000012c:	30209073          	csrw	medeleg,ra
 
-80000164 <test9>:
-80000164:	00900e13          	li	t3,9
-80000168:	00000f17          	auipc	t5,0x0
-8000016c:	038f0f13          	addi	t5,t5,56 # 800001a0 <test10>
-80000170:	000020b7          	lui	ra,0x2
-80000174:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
-80000178:	00000113          	li	sp,0
-8000017c:	3000b073          	csrc	mstatus,ra
-80000180:	30012073          	csrs	mstatus,sp
-80000184:	00000097          	auipc	ra,0x0
-80000188:	01408093          	addi	ra,ra,20 # 80000198 <test9+0x34>
-8000018c:	34109073          	csrw	mepc,ra
-80000190:	30200073          	mret
-80000194:	5540006f          	j	800006e8 <fail>
-80000198:	00102083          	lw	ra,1(zero) # 1 <_start-0x7fffffff>
-8000019c:	54c0006f          	j	800006e8 <fail>
+80000130 <test7>:
+80000130:	00700e13          	li	t3,7
+80000134:	00000f17          	auipc	t5,0x0
+80000138:	010f0f13          	addi	t5,t5,16 # 80000144 <test8>
+8000013c:	00102083          	lw	ra,1(zero) # 1 <_start-0x7fffffff>
+80000140:	0e90006f          	j	80000a28 <fail>
 
-800001a0 <test10>:
-800001a0:	00a00e13          	li	t3,10
-800001a4:	00000f17          	auipc	t5,0x0
-800001a8:	03cf0f13          	addi	t5,t5,60 # 800001e0 <test11>
-800001ac:	f00110b7          	lui	ra,0xf0011
-800001b0:	00000113          	li	sp,0
-800001b4:	0020a023          	sw	sp,0(ra) # f0011000 <strap+0x700108c8>
-800001b8:	00800093          	li	ra,8
-800001bc:	30009073          	csrw	mstatus,ra
-800001c0:	000010b7          	lui	ra,0x1
-800001c4:	80008093          	addi	ra,ra,-2048 # 800 <_start-0x7ffff800>
-800001c8:	30409073          	csrw	mie,ra
+80000144 <test8>:
+80000144:	00800e13          	li	t3,8
+80000148:	00000f17          	auipc	t5,0x0
+8000014c:	03cf0f13          	addi	t5,t5,60 # 80000184 <test9>
+80000150:	000020b7          	lui	ra,0x2
+80000154:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
+80000158:	00001137          	lui	sp,0x1
+8000015c:	80010113          	addi	sp,sp,-2048 # 800 <_start-0x7ffff800>
+80000160:	3000b073          	csrc	mstatus,ra
+80000164:	30012073          	csrs	mstatus,sp
+80000168:	00000097          	auipc	ra,0x0
+8000016c:	01408093          	addi	ra,ra,20 # 8000017c <test8+0x38>
+80000170:	34109073          	csrw	mepc,ra
+80000174:	30200073          	mret
+80000178:	0b10006f          	j	80000a28 <fail>
+8000017c:	00102083          	lw	ra,1(zero) # 1 <_start-0x7fffffff>
+80000180:	0a90006f          	j	80000a28 <fail>
+
+80000184 <test9>:
+80000184:	00900e13          	li	t3,9
+80000188:	00000f17          	auipc	t5,0x0
+8000018c:	038f0f13          	addi	t5,t5,56 # 800001c0 <test10>
+80000190:	000020b7          	lui	ra,0x2
+80000194:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
+80000198:	00000113          	li	sp,0
+8000019c:	3000b073          	csrc	mstatus,ra
+800001a0:	30012073          	csrs	mstatus,sp
+800001a4:	00000097          	auipc	ra,0x0
+800001a8:	01408093          	addi	ra,ra,20 # 800001b8 <test9+0x34>
+800001ac:	34109073          	csrw	mepc,ra
+800001b0:	30200073          	mret
+800001b4:	0750006f          	j	80000a28 <fail>
+800001b8:	00102083          	lw	ra,1(zero) # 1 <_start-0x7fffffff>
+800001bc:	06d0006f          	j	80000a28 <fail>
+
+800001c0 <test10>:
+800001c0:	00a00e13          	li	t3,10
+800001c4:	00000f17          	auipc	t5,0x0
+800001c8:	07cf0f13          	addi	t5,t5,124 # 80000240 <test11>
 800001cc:	f00110b7          	lui	ra,0xf0011
-800001d0:	00100113          	li	sp,1
-800001d4:	0020a023          	sw	sp,0(ra) # f0011000 <strap+0x700108c8>
-800001d8:	10500073          	wfi
-800001dc:	50c0006f          	j	800006e8 <fail>
-
-800001e0 <test11>:
-800001e0:	00b00e13          	li	t3,11
-800001e4:	00000f17          	auipc	t5,0x0
-800001e8:	068f0f13          	addi	t5,t5,104 # 8000024c <test12>
-800001ec:	f00110b7          	lui	ra,0xf0011
-800001f0:	00000113          	li	sp,0
-800001f4:	0020a023          	sw	sp,0(ra) # f0011000 <strap+0x700108c8>
+800001d0:	00000113          	li	sp,0
+800001d4:	0020a023          	sw	sp,0(ra) # f0011000 <strap+0x70010588>
+800001d8:	00000013          	nop
+800001dc:	00000013          	nop
+800001e0:	00000013          	nop
+800001e4:	00000013          	nop
+800001e8:	00000013          	nop
+800001ec:	00000013          	nop
+800001f0:	00000013          	nop
+800001f4:	00000013          	nop
 800001f8:	00800093          	li	ra,8
 800001fc:	30009073          	csrw	mstatus,ra
 80000200:	000010b7          	lui	ra,0x1
 80000204:	80008093          	addi	ra,ra,-2048 # 800 <_start-0x7ffff800>
 80000208:	30409073          	csrw	mie,ra
-8000020c:	000020b7          	lui	ra,0x2
-80000210:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
-80000214:	00001137          	lui	sp,0x1
-80000218:	80010113          	addi	sp,sp,-2048 # 800 <_start-0x7ffff800>
-8000021c:	3000b073          	csrc	mstatus,ra
-80000220:	30012073          	csrs	mstatus,sp
-80000224:	00000097          	auipc	ra,0x0
-80000228:	01408093          	addi	ra,ra,20 # 80000238 <test11+0x58>
-8000022c:	34109073          	csrw	mepc,ra
-80000230:	30200073          	mret
-80000234:	4b40006f          	j	800006e8 <fail>
-80000238:	f00110b7          	lui	ra,0xf0011
-8000023c:	00100113          	li	sp,1
-80000240:	0020a023          	sw	sp,0(ra) # f0011000 <strap+0x700108c8>
-80000244:	10500073          	wfi
-80000248:	4a00006f          	j	800006e8 <fail>
+8000020c:	f00110b7          	lui	ra,0xf0011
+80000210:	00100113          	li	sp,1
+80000214:	0020a023          	sw	sp,0(ra) # f0011000 <strap+0x70010588>
+80000218:	00000013          	nop
+8000021c:	00000013          	nop
+80000220:	00000013          	nop
+80000224:	00000013          	nop
+80000228:	00000013          	nop
+8000022c:	00000013          	nop
+80000230:	00000013          	nop
+80000234:	00000013          	nop
+80000238:	10500073          	wfi
+8000023c:	7ec0006f          	j	80000a28 <fail>
 
-8000024c <test12>:
-8000024c:	00c00e13          	li	t3,12
-80000250:	00000f17          	auipc	t5,0x0
-80000254:	064f0f13          	addi	t5,t5,100 # 800002b4 <test14>
-80000258:	f00110b7          	lui	ra,0xf0011
-8000025c:	00000113          	li	sp,0
-80000260:	0020a023          	sw	sp,0(ra) # f0011000 <strap+0x700108c8>
-80000264:	00800093          	li	ra,8
-80000268:	30009073          	csrw	mstatus,ra
-8000026c:	000010b7          	lui	ra,0x1
-80000270:	80008093          	addi	ra,ra,-2048 # 800 <_start-0x7ffff800>
-80000274:	30409073          	csrw	mie,ra
-80000278:	000020b7          	lui	ra,0x2
-8000027c:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
-80000280:	00000113          	li	sp,0
-80000284:	3000b073          	csrc	mstatus,ra
-80000288:	30012073          	csrs	mstatus,sp
-8000028c:	00000097          	auipc	ra,0x0
-80000290:	01408093          	addi	ra,ra,20 # 800002a0 <test12+0x54>
-80000294:	34109073          	csrw	mepc,ra
-80000298:	30200073          	mret
-8000029c:	44c0006f          	j	800006e8 <fail>
-800002a0:	f00110b7          	lui	ra,0xf0011
-800002a4:	00100113          	li	sp,1
-800002a8:	0020a023          	sw	sp,0(ra) # f0011000 <strap+0x700108c8>
-800002ac:	10500073          	wfi
-800002b0:	4380006f          	j	800006e8 <fail>
+80000240 <test11>:
+80000240:	00b00e13          	li	t3,11
+80000244:	00000f17          	auipc	t5,0x0
+80000248:	0a8f0f13          	addi	t5,t5,168 # 800002ec <test12>
+8000024c:	f00110b7          	lui	ra,0xf0011
+80000250:	00000113          	li	sp,0
+80000254:	0020a023          	sw	sp,0(ra) # f0011000 <strap+0x70010588>
+80000258:	00000013          	nop
+8000025c:	00000013          	nop
+80000260:	00000013          	nop
+80000264:	00000013          	nop
+80000268:	00000013          	nop
+8000026c:	00000013          	nop
+80000270:	00000013          	nop
+80000274:	00000013          	nop
+80000278:	00800093          	li	ra,8
+8000027c:	30009073          	csrw	mstatus,ra
+80000280:	000010b7          	lui	ra,0x1
+80000284:	80008093          	addi	ra,ra,-2048 # 800 <_start-0x7ffff800>
+80000288:	30409073          	csrw	mie,ra
+8000028c:	000020b7          	lui	ra,0x2
+80000290:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
+80000294:	00001137          	lui	sp,0x1
+80000298:	80010113          	addi	sp,sp,-2048 # 800 <_start-0x7ffff800>
+8000029c:	3000b073          	csrc	mstatus,ra
+800002a0:	30012073          	csrs	mstatus,sp
+800002a4:	00000097          	auipc	ra,0x0
+800002a8:	01408093          	addi	ra,ra,20 # 800002b8 <test11+0x78>
+800002ac:	34109073          	csrw	mepc,ra
+800002b0:	30200073          	mret
+800002b4:	7740006f          	j	80000a28 <fail>
+800002b8:	f00110b7          	lui	ra,0xf0011
+800002bc:	00100113          	li	sp,1
+800002c0:	0020a023          	sw	sp,0(ra) # f0011000 <strap+0x70010588>
+800002c4:	00000013          	nop
+800002c8:	00000013          	nop
+800002cc:	00000013          	nop
+800002d0:	00000013          	nop
+800002d4:	00000013          	nop
+800002d8:	00000013          	nop
+800002dc:	00000013          	nop
+800002e0:	00000013          	nop
+800002e4:	10500073          	wfi
+800002e8:	7400006f          	j	80000a28 <fail>
 
-800002b4 <test14>:
-800002b4:	00200093          	li	ra,2
-800002b8:	10009073          	csrw	sstatus,ra
-800002bc:	00e00e13          	li	t3,14
-800002c0:	00000f17          	auipc	t5,0x0
-800002c4:	040f0f13          	addi	t5,t5,64 # 80000300 <test15>
-800002c8:	f00120b7          	lui	ra,0xf0012
-800002cc:	00000113          	li	sp,0
-800002d0:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x700118c8>
-800002d4:	00200093          	li	ra,2
-800002d8:	30009073          	csrw	mstatus,ra
-800002dc:	20000093          	li	ra,512
-800002e0:	30409073          	csrw	mie,ra
-800002e4:	00000e93          	li	t4,0
-800002e8:	f00120b7          	lui	ra,0xf0012
-800002ec:	00100113          	li	sp,1
-800002f0:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x700118c8>
-800002f4:	06400093          	li	ra,100
-800002f8:	fff08093          	addi	ra,ra,-1
-800002fc:	fe104ee3          	bgtz	ra,800002f8 <test14+0x44>
+800002ec <test12>:
+800002ec:	00c00e13          	li	t3,12
+800002f0:	00000f17          	auipc	t5,0x0
+800002f4:	0a4f0f13          	addi	t5,t5,164 # 80000394 <test14>
+800002f8:	f00110b7          	lui	ra,0xf0011
+800002fc:	00000113          	li	sp,0
+80000300:	0020a023          	sw	sp,0(ra) # f0011000 <strap+0x70010588>
+80000304:	00000013          	nop
+80000308:	00000013          	nop
+8000030c:	00000013          	nop
+80000310:	00000013          	nop
+80000314:	00000013          	nop
+80000318:	00000013          	nop
+8000031c:	00000013          	nop
+80000320:	00000013          	nop
+80000324:	00800093          	li	ra,8
+80000328:	30009073          	csrw	mstatus,ra
+8000032c:	000010b7          	lui	ra,0x1
+80000330:	80008093          	addi	ra,ra,-2048 # 800 <_start-0x7ffff800>
+80000334:	30409073          	csrw	mie,ra
+80000338:	000020b7          	lui	ra,0x2
+8000033c:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
+80000340:	00000113          	li	sp,0
+80000344:	3000b073          	csrc	mstatus,ra
+80000348:	30012073          	csrs	mstatus,sp
+8000034c:	00000097          	auipc	ra,0x0
+80000350:	01408093          	addi	ra,ra,20 # 80000360 <test12+0x74>
+80000354:	34109073          	csrw	mepc,ra
+80000358:	30200073          	mret
+8000035c:	6cc0006f          	j	80000a28 <fail>
+80000360:	f00110b7          	lui	ra,0xf0011
+80000364:	00100113          	li	sp,1
+80000368:	0020a023          	sw	sp,0(ra) # f0011000 <strap+0x70010588>
+8000036c:	00000013          	nop
+80000370:	00000013          	nop
+80000374:	00000013          	nop
+80000378:	00000013          	nop
+8000037c:	00000013          	nop
+80000380:	00000013          	nop
+80000384:	00000013          	nop
+80000388:	00000013          	nop
+8000038c:	10500073          	wfi
+80000390:	6980006f          	j	80000a28 <fail>
 
-80000300 <test15>:
-80000300:	00f00e13          	li	t3,15
-80000304:	00000f17          	auipc	t5,0x0
-80000308:	068f0f13          	addi	t5,t5,104 # 8000036c <test16>
-8000030c:	f00120b7          	lui	ra,0xf0012
-80000310:	00000113          	li	sp,0
-80000314:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x700118c8>
-80000318:	00200093          	li	ra,2
-8000031c:	30009073          	csrw	mstatus,ra
-80000320:	20000093          	li	ra,512
-80000324:	30409073          	csrw	mie,ra
-80000328:	000020b7          	lui	ra,0x2
-8000032c:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
-80000330:	00001137          	lui	sp,0x1
-80000334:	80010113          	addi	sp,sp,-2048 # 800 <_start-0x7ffff800>
-80000338:	3000b073          	csrc	mstatus,ra
-8000033c:	30012073          	csrs	mstatus,sp
-80000340:	00000097          	auipc	ra,0x0
-80000344:	01408093          	addi	ra,ra,20 # 80000354 <test15+0x54>
-80000348:	34109073          	csrw	mepc,ra
-8000034c:	30200073          	mret
-80000350:	3980006f          	j	800006e8 <fail>
-80000354:	00100e93          	li	t4,1
-80000358:	f00120b7          	lui	ra,0xf0012
-8000035c:	00100113          	li	sp,1
-80000360:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x700118c8>
-80000364:	10500073          	wfi
-80000368:	3800006f          	j	800006e8 <fail>
+80000394 <test14>:
+80000394:	00200093          	li	ra,2
+80000398:	10009073          	csrw	sstatus,ra
+8000039c:	00e00e13          	li	t3,14
+800003a0:	00000f17          	auipc	t5,0x0
+800003a4:	080f0f13          	addi	t5,t5,128 # 80000420 <test15>
+800003a8:	f00120b7          	lui	ra,0xf0012
+800003ac:	00000113          	li	sp,0
+800003b0:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x70011588>
+800003b4:	00000013          	nop
+800003b8:	00000013          	nop
+800003bc:	00000013          	nop
+800003c0:	00000013          	nop
+800003c4:	00000013          	nop
+800003c8:	00000013          	nop
+800003cc:	00000013          	nop
+800003d0:	00000013          	nop
+800003d4:	00200093          	li	ra,2
+800003d8:	30009073          	csrw	mstatus,ra
+800003dc:	20000093          	li	ra,512
+800003e0:	30409073          	csrw	mie,ra
+800003e4:	00000e93          	li	t4,0
+800003e8:	f00120b7          	lui	ra,0xf0012
+800003ec:	00100113          	li	sp,1
+800003f0:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x70011588>
+800003f4:	00000013          	nop
+800003f8:	00000013          	nop
+800003fc:	00000013          	nop
+80000400:	00000013          	nop
+80000404:	00000013          	nop
+80000408:	00000013          	nop
+8000040c:	00000013          	nop
+80000410:	00000013          	nop
+80000414:	06400093          	li	ra,100
+80000418:	fff08093          	addi	ra,ra,-1
+8000041c:	fe104ee3          	bgtz	ra,80000418 <test14+0x84>
 
-8000036c <test16>:
-8000036c:	01000e13          	li	t3,16
-80000370:	00000f17          	auipc	t5,0x0
-80000374:	060f0f13          	addi	t5,t5,96 # 800003d0 <test17>
-80000378:	f00120b7          	lui	ra,0xf0012
-8000037c:	00000113          	li	sp,0
-80000380:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x700118c8>
-80000384:	00200093          	li	ra,2
-80000388:	30009073          	csrw	mstatus,ra
-8000038c:	20000093          	li	ra,512
-80000390:	30409073          	csrw	mie,ra
-80000394:	000020b7          	lui	ra,0x2
-80000398:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
-8000039c:	00000113          	li	sp,0
-800003a0:	3000b073          	csrc	mstatus,ra
-800003a4:	30012073          	csrs	mstatus,sp
-800003a8:	00000097          	auipc	ra,0x0
-800003ac:	01408093          	addi	ra,ra,20 # 800003bc <test16+0x50>
-800003b0:	34109073          	csrw	mepc,ra
-800003b4:	30200073          	mret
-800003b8:	3300006f          	j	800006e8 <fail>
-800003bc:	f00120b7          	lui	ra,0xf0012
-800003c0:	00100113          	li	sp,1
-800003c4:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x700118c8>
-800003c8:	10500073          	wfi
-800003cc:	31c0006f          	j	800006e8 <fail>
+80000420 <test15>:
+80000420:	00f00e13          	li	t3,15
+80000424:	00000f17          	auipc	t5,0x0
+80000428:	0a8f0f13          	addi	t5,t5,168 # 800004cc <test16>
+8000042c:	f00120b7          	lui	ra,0xf0012
+80000430:	00000113          	li	sp,0
+80000434:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x70011588>
+80000438:	00000013          	nop
+8000043c:	00000013          	nop
+80000440:	00000013          	nop
+80000444:	00000013          	nop
+80000448:	00000013          	nop
+8000044c:	00000013          	nop
+80000450:	00000013          	nop
+80000454:	00000013          	nop
+80000458:	00200093          	li	ra,2
+8000045c:	30009073          	csrw	mstatus,ra
+80000460:	20000093          	li	ra,512
+80000464:	30409073          	csrw	mie,ra
+80000468:	000020b7          	lui	ra,0x2
+8000046c:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
+80000470:	00001137          	lui	sp,0x1
+80000474:	80010113          	addi	sp,sp,-2048 # 800 <_start-0x7ffff800>
+80000478:	3000b073          	csrc	mstatus,ra
+8000047c:	30012073          	csrs	mstatus,sp
+80000480:	00000097          	auipc	ra,0x0
+80000484:	01408093          	addi	ra,ra,20 # 80000494 <test15+0x74>
+80000488:	34109073          	csrw	mepc,ra
+8000048c:	30200073          	mret
+80000490:	5980006f          	j	80000a28 <fail>
+80000494:	00100e93          	li	t4,1
+80000498:	f00120b7          	lui	ra,0xf0012
+8000049c:	00100113          	li	sp,1
+800004a0:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x70011588>
+800004a4:	00000013          	nop
+800004a8:	00000013          	nop
+800004ac:	00000013          	nop
+800004b0:	00000013          	nop
+800004b4:	00000013          	nop
+800004b8:	00000013          	nop
+800004bc:	00000013          	nop
+800004c0:	00000013          	nop
+800004c4:	10500073          	wfi
+800004c8:	5600006f          	j	80000a28 <fail>
 
-800003d0 <test17>:
-800003d0:	01100e13          	li	t3,17
-800003d4:	20000093          	li	ra,512
-800003d8:	30309073          	csrw	mideleg,ra
-800003dc:	00000f17          	auipc	t5,0x0
-800003e0:	040f0f13          	addi	t5,t5,64 # 8000041c <test18>
-800003e4:	f00120b7          	lui	ra,0xf0012
-800003e8:	00000113          	li	sp,0
-800003ec:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x700118c8>
-800003f0:	00200093          	li	ra,2
-800003f4:	30009073          	csrw	mstatus,ra
-800003f8:	20000093          	li	ra,512
-800003fc:	30409073          	csrw	mie,ra
-80000400:	00000e93          	li	t4,0
-80000404:	f00120b7          	lui	ra,0xf0012
-80000408:	00100113          	li	sp,1
-8000040c:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x700118c8>
-80000410:	06400093          	li	ra,100
-80000414:	fff08093          	addi	ra,ra,-1
-80000418:	fe104ee3          	bgtz	ra,80000414 <test17+0x44>
-
-8000041c <test18>:
-8000041c:	01200e13          	li	t3,18
-80000420:	00000f17          	auipc	t5,0x0
-80000424:	068f0f13          	addi	t5,t5,104 # 80000488 <test19>
-80000428:	f00120b7          	lui	ra,0xf0012
-8000042c:	00000113          	li	sp,0
-80000430:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x700118c8>
-80000434:	00200093          	li	ra,2
-80000438:	30009073          	csrw	mstatus,ra
-8000043c:	20000093          	li	ra,512
-80000440:	30409073          	csrw	mie,ra
-80000444:	000020b7          	lui	ra,0x2
-80000448:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
-8000044c:	00001137          	lui	sp,0x1
-80000450:	80010113          	addi	sp,sp,-2048 # 800 <_start-0x7ffff800>
-80000454:	3000b073          	csrc	mstatus,ra
-80000458:	30012073          	csrs	mstatus,sp
-8000045c:	00000097          	auipc	ra,0x0
-80000460:	01408093          	addi	ra,ra,20 # 80000470 <test18+0x54>
-80000464:	34109073          	csrw	mepc,ra
-80000468:	30200073          	mret
-8000046c:	27c0006f          	j	800006e8 <fail>
-80000470:	00100e93          	li	t4,1
-80000474:	f00120b7          	lui	ra,0xf0012
-80000478:	00100113          	li	sp,1
-8000047c:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x700118c8>
-80000480:	10500073          	wfi
-80000484:	2640006f          	j	800006e8 <fail>
-
-80000488 <test19>:
-80000488:	01300e13          	li	t3,19
-8000048c:	00000f17          	auipc	t5,0x0
-80000490:	060f0f13          	addi	t5,t5,96 # 800004ec <test20>
-80000494:	f00120b7          	lui	ra,0xf0012
-80000498:	00000113          	li	sp,0
-8000049c:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x700118c8>
-800004a0:	00200093          	li	ra,2
-800004a4:	30009073          	csrw	mstatus,ra
-800004a8:	20000093          	li	ra,512
-800004ac:	30409073          	csrw	mie,ra
-800004b0:	000020b7          	lui	ra,0x2
-800004b4:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
-800004b8:	00000113          	li	sp,0
-800004bc:	3000b073          	csrc	mstatus,ra
-800004c0:	30012073          	csrs	mstatus,sp
-800004c4:	00000097          	auipc	ra,0x0
-800004c8:	01408093          	addi	ra,ra,20 # 800004d8 <test19+0x50>
-800004cc:	34109073          	csrw	mepc,ra
-800004d0:	30200073          	mret
-800004d4:	2140006f          	j	800006e8 <fail>
+800004cc <test16>:
+800004cc:	01000e13          	li	t3,16
+800004d0:	00000f17          	auipc	t5,0x0
+800004d4:	0a0f0f13          	addi	t5,t5,160 # 80000570 <test17>
 800004d8:	f00120b7          	lui	ra,0xf0012
-800004dc:	00100113          	li	sp,1
-800004e0:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x700118c8>
-800004e4:	10500073          	wfi
-800004e8:	2000006f          	j	800006e8 <fail>
-
-800004ec <test20>:
-800004ec:	f00120b7          	lui	ra,0xf0012
-800004f0:	00000113          	li	sp,0
-800004f4:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x700118c8>
-800004f8:	01400e13          	li	t3,20
-800004fc:	00000f17          	auipc	t5,0x0
-80000500:	030f0f13          	addi	t5,t5,48 # 8000052c <test21>
+800004dc:	00000113          	li	sp,0
+800004e0:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x70011588>
+800004e4:	00000013          	nop
+800004e8:	00000013          	nop
+800004ec:	00000013          	nop
+800004f0:	00000013          	nop
+800004f4:	00000013          	nop
+800004f8:	00000013          	nop
+800004fc:	00000013          	nop
+80000500:	00000013          	nop
 80000504:	00200093          	li	ra,2
 80000508:	30009073          	csrw	mstatus,ra
 8000050c:	20000093          	li	ra,512
 80000510:	30409073          	csrw	mie,ra
-80000514:	00000e93          	li	t4,0
-80000518:	20000093          	li	ra,512
-8000051c:	1440a073          	csrs	sip,ra
-80000520:	06400093          	li	ra,100
-80000524:	fff08093          	addi	ra,ra,-1
-80000528:	fe104ee3          	bgtz	ra,80000524 <test20+0x38>
+80000514:	000020b7          	lui	ra,0x2
+80000518:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
+8000051c:	00000113          	li	sp,0
+80000520:	3000b073          	csrc	mstatus,ra
+80000524:	30012073          	csrs	mstatus,sp
+80000528:	00000097          	auipc	ra,0x0
+8000052c:	01408093          	addi	ra,ra,20 # 8000053c <test16+0x70>
+80000530:	34109073          	csrw	mepc,ra
+80000534:	30200073          	mret
+80000538:	4f00006f          	j	80000a28 <fail>
+8000053c:	f00120b7          	lui	ra,0xf0012
+80000540:	00100113          	li	sp,1
+80000544:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x70011588>
+80000548:	00000013          	nop
+8000054c:	00000013          	nop
+80000550:	00000013          	nop
+80000554:	00000013          	nop
+80000558:	00000013          	nop
+8000055c:	00000013          	nop
+80000560:	00000013          	nop
+80000564:	00000013          	nop
+80000568:	10500073          	wfi
+8000056c:	4bc0006f          	j	80000a28 <fail>
 
-8000052c <test21>:
-8000052c:	01500e13          	li	t3,21
-80000530:	00000f17          	auipc	t5,0x0
-80000534:	060f0f13          	addi	t5,t5,96 # 80000590 <test22>
-80000538:	20000093          	li	ra,512
-8000053c:	1440b073          	csrc	sip,ra
-80000540:	00200093          	li	ra,2
-80000544:	30009073          	csrw	mstatus,ra
-80000548:	20000093          	li	ra,512
-8000054c:	30409073          	csrw	mie,ra
-80000550:	000020b7          	lui	ra,0x2
-80000554:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
-80000558:	00001137          	lui	sp,0x1
-8000055c:	80010113          	addi	sp,sp,-2048 # 800 <_start-0x7ffff800>
-80000560:	3000b073          	csrc	mstatus,ra
-80000564:	30012073          	csrs	mstatus,sp
-80000568:	00000097          	auipc	ra,0x0
-8000056c:	01408093          	addi	ra,ra,20 # 8000057c <test21+0x50>
-80000570:	34109073          	csrw	mepc,ra
-80000574:	30200073          	mret
-80000578:	1700006f          	j	800006e8 <fail>
-8000057c:	00100e93          	li	t4,1
-80000580:	20000093          	li	ra,512
-80000584:	1440a073          	csrs	sip,ra
-80000588:	10500073          	wfi
-8000058c:	15c0006f          	j	800006e8 <fail>
+80000570 <test17>:
+80000570:	01100e13          	li	t3,17
+80000574:	20000093          	li	ra,512
+80000578:	30309073          	csrw	mideleg,ra
+8000057c:	00000f17          	auipc	t5,0x0
+80000580:	080f0f13          	addi	t5,t5,128 # 800005fc <test18>
+80000584:	f00120b7          	lui	ra,0xf0012
+80000588:	00000113          	li	sp,0
+8000058c:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x70011588>
+80000590:	00000013          	nop
+80000594:	00000013          	nop
+80000598:	00000013          	nop
+8000059c:	00000013          	nop
+800005a0:	00000013          	nop
+800005a4:	00000013          	nop
+800005a8:	00000013          	nop
+800005ac:	00000013          	nop
+800005b0:	00200093          	li	ra,2
+800005b4:	30009073          	csrw	mstatus,ra
+800005b8:	20000093          	li	ra,512
+800005bc:	30409073          	csrw	mie,ra
+800005c0:	00000e93          	li	t4,0
+800005c4:	f00120b7          	lui	ra,0xf0012
+800005c8:	00100113          	li	sp,1
+800005cc:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x70011588>
+800005d0:	00000013          	nop
+800005d4:	00000013          	nop
+800005d8:	00000013          	nop
+800005dc:	00000013          	nop
+800005e0:	00000013          	nop
+800005e4:	00000013          	nop
+800005e8:	00000013          	nop
+800005ec:	00000013          	nop
+800005f0:	06400093          	li	ra,100
+800005f4:	fff08093          	addi	ra,ra,-1
+800005f8:	fe104ee3          	bgtz	ra,800005f4 <test17+0x84>
 
-80000590 <test22>:
-80000590:	01600e13          	li	t3,22
-80000594:	00000f17          	auipc	t5,0x0
-80000598:	058f0f13          	addi	t5,t5,88 # 800005ec <test23>
-8000059c:	20000093          	li	ra,512
-800005a0:	1440b073          	csrc	sip,ra
-800005a4:	00200093          	li	ra,2
-800005a8:	30009073          	csrw	mstatus,ra
-800005ac:	20000093          	li	ra,512
-800005b0:	30409073          	csrw	mie,ra
-800005b4:	20000093          	li	ra,512
-800005b8:	1440a073          	csrs	sip,ra
-800005bc:	000020b7          	lui	ra,0x2
-800005c0:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
-800005c4:	00000113          	li	sp,0
-800005c8:	3000b073          	csrc	mstatus,ra
-800005cc:	30012073          	csrs	mstatus,sp
-800005d0:	00000097          	auipc	ra,0x0
-800005d4:	01408093          	addi	ra,ra,20 # 800005e4 <test22+0x54>
-800005d8:	34109073          	csrw	mepc,ra
-800005dc:	30200073          	mret
-800005e0:	1080006f          	j	800006e8 <fail>
-800005e4:	10500073          	wfi
-800005e8:	1000006f          	j	800006e8 <fail>
+800005fc <test18>:
+800005fc:	01200e13          	li	t3,18
+80000600:	00000f17          	auipc	t5,0x0
+80000604:	0a8f0f13          	addi	t5,t5,168 # 800006a8 <test19>
+80000608:	f00120b7          	lui	ra,0xf0012
+8000060c:	00000113          	li	sp,0
+80000610:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x70011588>
+80000614:	00000013          	nop
+80000618:	00000013          	nop
+8000061c:	00000013          	nop
+80000620:	00000013          	nop
+80000624:	00000013          	nop
+80000628:	00000013          	nop
+8000062c:	00000013          	nop
+80000630:	00000013          	nop
+80000634:	00200093          	li	ra,2
+80000638:	30009073          	csrw	mstatus,ra
+8000063c:	20000093          	li	ra,512
+80000640:	30409073          	csrw	mie,ra
+80000644:	000020b7          	lui	ra,0x2
+80000648:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
+8000064c:	00001137          	lui	sp,0x1
+80000650:	80010113          	addi	sp,sp,-2048 # 800 <_start-0x7ffff800>
+80000654:	3000b073          	csrc	mstatus,ra
+80000658:	30012073          	csrs	mstatus,sp
+8000065c:	00000097          	auipc	ra,0x0
+80000660:	01408093          	addi	ra,ra,20 # 80000670 <test18+0x74>
+80000664:	34109073          	csrw	mepc,ra
+80000668:	30200073          	mret
+8000066c:	3bc0006f          	j	80000a28 <fail>
+80000670:	00100e93          	li	t4,1
+80000674:	f00120b7          	lui	ra,0xf0012
+80000678:	00100113          	li	sp,1
+8000067c:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x70011588>
+80000680:	00000013          	nop
+80000684:	00000013          	nop
+80000688:	00000013          	nop
+8000068c:	00000013          	nop
+80000690:	00000013          	nop
+80000694:	00000013          	nop
+80000698:	00000013          	nop
+8000069c:	00000013          	nop
+800006a0:	10500073          	wfi
+800006a4:	3840006f          	j	80000a28 <fail>
 
-800005ec <test23>:
-800005ec:	01700e13          	li	t3,23
-800005f0:	00000e93          	li	t4,0
-800005f4:	f00120b7          	lui	ra,0xf0012
-800005f8:	00000113          	li	sp,0
-800005fc:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x700118c8>
-80000600:	20000093          	li	ra,512
-80000604:	1440b073          	csrc	sip,ra
-80000608:	344021f3          	csrr	gp,mip
-8000060c:	f00120b7          	lui	ra,0xf0012
-80000610:	00100113          	li	sp,1
-80000614:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x700118c8>
-80000618:	20000093          	li	ra,512
-8000061c:	1440b073          	csrc	sip,ra
-80000620:	344021f3          	csrr	gp,mip
-80000624:	f00120b7          	lui	ra,0xf0012
-80000628:	00000113          	li	sp,0
-8000062c:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x700118c8>
-80000630:	20000093          	li	ra,512
-80000634:	1440b073          	csrc	sip,ra
-80000638:	344021f3          	csrr	gp,mip
-8000063c:	f00120b7          	lui	ra,0xf0012
-80000640:	00000113          	li	sp,0
-80000644:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x700118c8>
-80000648:	20000093          	li	ra,512
-8000064c:	1440a073          	csrs	sip,ra
-80000650:	344021f3          	csrr	gp,mip
-80000654:	f00120b7          	lui	ra,0xf0012
-80000658:	00100113          	li	sp,1
-8000065c:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x700118c8>
-80000660:	20000093          	li	ra,512
-80000664:	1440a073          	csrs	sip,ra
-80000668:	344021f3          	csrr	gp,mip
-8000066c:	f00120b7          	lui	ra,0xf0012
-80000670:	00000113          	li	sp,0
-80000674:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x700118c8>
+800006a8 <test19>:
+800006a8:	01300e13          	li	t3,19
+800006ac:	00000f17          	auipc	t5,0x0
+800006b0:	0a0f0f13          	addi	t5,t5,160 # 8000074c <test20>
+800006b4:	f00120b7          	lui	ra,0xf0012
+800006b8:	00000113          	li	sp,0
+800006bc:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x70011588>
+800006c0:	00000013          	nop
+800006c4:	00000013          	nop
+800006c8:	00000013          	nop
+800006cc:	00000013          	nop
+800006d0:	00000013          	nop
+800006d4:	00000013          	nop
+800006d8:	00000013          	nop
+800006dc:	00000013          	nop
+800006e0:	00200093          	li	ra,2
+800006e4:	30009073          	csrw	mstatus,ra
+800006e8:	20000093          	li	ra,512
+800006ec:	30409073          	csrw	mie,ra
+800006f0:	000020b7          	lui	ra,0x2
+800006f4:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
+800006f8:	00000113          	li	sp,0
+800006fc:	3000b073          	csrc	mstatus,ra
+80000700:	30012073          	csrs	mstatus,sp
+80000704:	00000097          	auipc	ra,0x0
+80000708:	01408093          	addi	ra,ra,20 # 80000718 <test19+0x70>
+8000070c:	34109073          	csrw	mepc,ra
+80000710:	30200073          	mret
+80000714:	3140006f          	j	80000a28 <fail>
+80000718:	f00120b7          	lui	ra,0xf0012
+8000071c:	00100113          	li	sp,1
+80000720:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x70011588>
+80000724:	00000013          	nop
+80000728:	00000013          	nop
+8000072c:	00000013          	nop
+80000730:	00000013          	nop
+80000734:	00000013          	nop
+80000738:	00000013          	nop
+8000073c:	00000013          	nop
+80000740:	00000013          	nop
+80000744:	10500073          	wfi
+80000748:	2e00006f          	j	80000a28 <fail>
 
-80000678 <test24>:
-80000678:	01800e13          	li	t3,24
-8000067c:	00200093          	li	ra,2
-80000680:	3040a073          	csrs	mie,ra
-80000684:	3440a073          	csrs	mip,ra
-80000688:	3000a073          	csrs	mstatus,ra
-8000068c:	00100e93          	li	t4,1
-80000690:	00000f17          	auipc	t5,0x0
-80000694:	03cf0f13          	addi	t5,t5,60 # 800006cc <test25>
-80000698:	000020b7          	lui	ra,0x2
-8000069c:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
-800006a0:	00001137          	lui	sp,0x1
-800006a4:	80010113          	addi	sp,sp,-2048 # 800 <_start-0x7ffff800>
-800006a8:	3000b073          	csrc	mstatus,ra
-800006ac:	30012073          	csrs	mstatus,sp
-800006b0:	00000097          	auipc	ra,0x0
-800006b4:	01408093          	addi	ra,ra,20 # 800006c4 <test24_s>
-800006b8:	34109073          	csrw	mepc,ra
-800006bc:	30200073          	mret
-800006c0:	0280006f          	j	800006e8 <fail>
-
-800006c4 <test24_s>:
-800006c4:	10500073          	wfi
-800006c8:	0200006f          	j	800006e8 <fail>
-
-800006cc <test25>:
-800006cc:	01900e13          	li	t3,25
-800006d0:	00000f17          	auipc	t5,0x0
-800006d4:	014f0f13          	addi	t5,t5,20 # 800006e4 <test26>
-800006d8:	30046073          	csrsi	mstatus,8
-800006dc:	10500073          	wfi
-800006e0:	0080006f          	j	800006e8 <fail>
-
-800006e4 <test26>:
-800006e4:	0100006f          	j	800006f4 <pass>
-
-800006e8 <fail>:
-800006e8:	f0100137          	lui	sp,0xf0100
-800006ec:	f2410113          	addi	sp,sp,-220 # f00fff24 <strap+0x700ff7ec>
-800006f0:	01c12023          	sw	t3,0(sp)
-
-800006f4 <pass>:
-800006f4:	f0100137          	lui	sp,0xf0100
-800006f8:	f2010113          	addi	sp,sp,-224 # f00fff20 <strap+0x700ff7e8>
-800006fc:	00012023          	sw	zero,0(sp)
-
-80000700 <mtrap>:
-80000700:	fe0e84e3          	beqz	t4,800006e8 <fail>
-80000704:	342020f3          	csrr	ra,mcause
-80000708:	341020f3          	csrr	ra,mepc
-8000070c:	300020f3          	csrr	ra,mstatus
-80000710:	343020f3          	csrr	ra,mtval
-80000714:	08000093          	li	ra,128
-80000718:	3000b073          	csrc	mstatus,ra
-8000071c:	00200093          	li	ra,2
-80000720:	fc1e8ae3          	beq	t4,ra,800006f4 <pass>
-80000724:	000020b7          	lui	ra,0x2
-80000728:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
-8000072c:	3000a073          	csrs	mstatus,ra
-80000730:	341f1073          	csrw	mepc,t5
-80000734:	30200073          	mret
-
-80000738 <strap>:
-80000738:	fa0e88e3          	beqz	t4,800006e8 <fail>
-8000073c:	142020f3          	csrr	ra,scause
-80000740:	141020f3          	csrr	ra,sepc
-80000744:	100020f3          	csrr	ra,sstatus
-80000748:	143020f3          	csrr	ra,stval
-8000074c:	00000073          	ecall
-80000750:	00000013          	nop
-80000754:	00000013          	nop
+8000074c <test20>:
+8000074c:	f00120b7          	lui	ra,0xf0012
+80000750:	00000113          	li	sp,0
+80000754:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x70011588>
 80000758:	00000013          	nop
 8000075c:	00000013          	nop
 80000760:	00000013          	nop
 80000764:	00000013          	nop
+80000768:	00000013          	nop
+8000076c:	00000013          	nop
+80000770:	00000013          	nop
+80000774:	00000013          	nop
+80000778:	01400e13          	li	t3,20
+8000077c:	00000f17          	auipc	t5,0x0
+80000780:	030f0f13          	addi	t5,t5,48 # 800007ac <test21>
+80000784:	00200093          	li	ra,2
+80000788:	30009073          	csrw	mstatus,ra
+8000078c:	20000093          	li	ra,512
+80000790:	30409073          	csrw	mie,ra
+80000794:	00000e93          	li	t4,0
+80000798:	20000093          	li	ra,512
+8000079c:	1440a073          	csrs	sip,ra
+800007a0:	06400093          	li	ra,100
+800007a4:	fff08093          	addi	ra,ra,-1
+800007a8:	fe104ee3          	bgtz	ra,800007a4 <test20+0x58>
+
+800007ac <test21>:
+800007ac:	01500e13          	li	t3,21
+800007b0:	00000f17          	auipc	t5,0x0
+800007b4:	060f0f13          	addi	t5,t5,96 # 80000810 <test22>
+800007b8:	20000093          	li	ra,512
+800007bc:	1440b073          	csrc	sip,ra
+800007c0:	00200093          	li	ra,2
+800007c4:	30009073          	csrw	mstatus,ra
+800007c8:	20000093          	li	ra,512
+800007cc:	30409073          	csrw	mie,ra
+800007d0:	000020b7          	lui	ra,0x2
+800007d4:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
+800007d8:	00001137          	lui	sp,0x1
+800007dc:	80010113          	addi	sp,sp,-2048 # 800 <_start-0x7ffff800>
+800007e0:	3000b073          	csrc	mstatus,ra
+800007e4:	30012073          	csrs	mstatus,sp
+800007e8:	00000097          	auipc	ra,0x0
+800007ec:	01408093          	addi	ra,ra,20 # 800007fc <test21+0x50>
+800007f0:	34109073          	csrw	mepc,ra
+800007f4:	30200073          	mret
+800007f8:	2300006f          	j	80000a28 <fail>
+800007fc:	00100e93          	li	t4,1
+80000800:	20000093          	li	ra,512
+80000804:	1440a073          	csrs	sip,ra
+80000808:	10500073          	wfi
+8000080c:	21c0006f          	j	80000a28 <fail>
+
+80000810 <test22>:
+80000810:	01600e13          	li	t3,22
+80000814:	00000f17          	auipc	t5,0x0
+80000818:	058f0f13          	addi	t5,t5,88 # 8000086c <test23>
+8000081c:	20000093          	li	ra,512
+80000820:	1440b073          	csrc	sip,ra
+80000824:	00200093          	li	ra,2
+80000828:	30009073          	csrw	mstatus,ra
+8000082c:	20000093          	li	ra,512
+80000830:	30409073          	csrw	mie,ra
+80000834:	20000093          	li	ra,512
+80000838:	1440a073          	csrs	sip,ra
+8000083c:	000020b7          	lui	ra,0x2
+80000840:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
+80000844:	00000113          	li	sp,0
+80000848:	3000b073          	csrc	mstatus,ra
+8000084c:	30012073          	csrs	mstatus,sp
+80000850:	00000097          	auipc	ra,0x0
+80000854:	01408093          	addi	ra,ra,20 # 80000864 <test22+0x54>
+80000858:	34109073          	csrw	mepc,ra
+8000085c:	30200073          	mret
+80000860:	1c80006f          	j	80000a28 <fail>
+80000864:	10500073          	wfi
+80000868:	1c00006f          	j	80000a28 <fail>
+
+8000086c <test23>:
+8000086c:	01700e13          	li	t3,23
+80000870:	00000e93          	li	t4,0
+80000874:	f00120b7          	lui	ra,0xf0012
+80000878:	00000113          	li	sp,0
+8000087c:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x70011588>
+80000880:	00000013          	nop
+80000884:	00000013          	nop
+80000888:	00000013          	nop
+8000088c:	00000013          	nop
+80000890:	00000013          	nop
+80000894:	00000013          	nop
+80000898:	00000013          	nop
+8000089c:	00000013          	nop
+800008a0:	20000093          	li	ra,512
+800008a4:	1440b073          	csrc	sip,ra
+800008a8:	344021f3          	csrr	gp,mip
+800008ac:	f00120b7          	lui	ra,0xf0012
+800008b0:	00100113          	li	sp,1
+800008b4:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x70011588>
+800008b8:	00000013          	nop
+800008bc:	00000013          	nop
+800008c0:	00000013          	nop
+800008c4:	00000013          	nop
+800008c8:	00000013          	nop
+800008cc:	00000013          	nop
+800008d0:	00000013          	nop
+800008d4:	00000013          	nop
+800008d8:	20000093          	li	ra,512
+800008dc:	1440b073          	csrc	sip,ra
+800008e0:	344021f3          	csrr	gp,mip
+800008e4:	f00120b7          	lui	ra,0xf0012
+800008e8:	00000113          	li	sp,0
+800008ec:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x70011588>
+800008f0:	00000013          	nop
+800008f4:	00000013          	nop
+800008f8:	00000013          	nop
+800008fc:	00000013          	nop
+80000900:	00000013          	nop
+80000904:	00000013          	nop
+80000908:	00000013          	nop
+8000090c:	00000013          	nop
+80000910:	20000093          	li	ra,512
+80000914:	1440b073          	csrc	sip,ra
+80000918:	344021f3          	csrr	gp,mip
+8000091c:	f00120b7          	lui	ra,0xf0012
+80000920:	00000113          	li	sp,0
+80000924:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x70011588>
+80000928:	00000013          	nop
+8000092c:	00000013          	nop
+80000930:	00000013          	nop
+80000934:	00000013          	nop
+80000938:	00000013          	nop
+8000093c:	00000013          	nop
+80000940:	00000013          	nop
+80000944:	00000013          	nop
+80000948:	20000093          	li	ra,512
+8000094c:	1440a073          	csrs	sip,ra
+80000950:	344021f3          	csrr	gp,mip
+80000954:	f00120b7          	lui	ra,0xf0012
+80000958:	00100113          	li	sp,1
+8000095c:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x70011588>
+80000960:	00000013          	nop
+80000964:	00000013          	nop
+80000968:	00000013          	nop
+8000096c:	00000013          	nop
+80000970:	00000013          	nop
+80000974:	00000013          	nop
+80000978:	00000013          	nop
+8000097c:	00000013          	nop
+80000980:	20000093          	li	ra,512
+80000984:	1440a073          	csrs	sip,ra
+80000988:	344021f3          	csrr	gp,mip
+8000098c:	f00120b7          	lui	ra,0xf0012
+80000990:	00000113          	li	sp,0
+80000994:	0020a023          	sw	sp,0(ra) # f0012000 <strap+0x70011588>
+80000998:	00000013          	nop
+8000099c:	00000013          	nop
+800009a0:	00000013          	nop
+800009a4:	00000013          	nop
+800009a8:	00000013          	nop
+800009ac:	00000013          	nop
+800009b0:	00000013          	nop
+800009b4:	00000013          	nop
+
+800009b8 <test24>:
+800009b8:	01800e13          	li	t3,24
+800009bc:	00200093          	li	ra,2
+800009c0:	3040a073          	csrs	mie,ra
+800009c4:	3440a073          	csrs	mip,ra
+800009c8:	3000a073          	csrs	mstatus,ra
+800009cc:	00100e93          	li	t4,1
+800009d0:	00000f17          	auipc	t5,0x0
+800009d4:	03cf0f13          	addi	t5,t5,60 # 80000a0c <test25>
+800009d8:	000020b7          	lui	ra,0x2
+800009dc:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
+800009e0:	00001137          	lui	sp,0x1
+800009e4:	80010113          	addi	sp,sp,-2048 # 800 <_start-0x7ffff800>
+800009e8:	3000b073          	csrc	mstatus,ra
+800009ec:	30012073          	csrs	mstatus,sp
+800009f0:	00000097          	auipc	ra,0x0
+800009f4:	01408093          	addi	ra,ra,20 # 80000a04 <test24_s>
+800009f8:	34109073          	csrw	mepc,ra
+800009fc:	30200073          	mret
+80000a00:	0280006f          	j	80000a28 <fail>
+
+80000a04 <test24_s>:
+80000a04:	10500073          	wfi
+80000a08:	0200006f          	j	80000a28 <fail>
+
+80000a0c <test25>:
+80000a0c:	01900e13          	li	t3,25
+80000a10:	00000f17          	auipc	t5,0x0
+80000a14:	014f0f13          	addi	t5,t5,20 # 80000a24 <test26>
+80000a18:	30046073          	csrsi	mstatus,8
+80000a1c:	10500073          	wfi
+80000a20:	0080006f          	j	80000a28 <fail>
+
+80000a24 <test26>:
+80000a24:	0100006f          	j	80000a34 <pass>
+
+80000a28 <fail>:
+80000a28:	f0100137          	lui	sp,0xf0100
+80000a2c:	f2410113          	addi	sp,sp,-220 # f00fff24 <strap+0x700ff4ac>
+80000a30:	01c12023          	sw	t3,0(sp)
+
+80000a34 <pass>:
+80000a34:	f0100137          	lui	sp,0xf0100
+80000a38:	f2010113          	addi	sp,sp,-224 # f00fff20 <strap+0x700ff4a8>
+80000a3c:	00012023          	sw	zero,0(sp)
+
+80000a40 <mtrap>:
+80000a40:	fe0e84e3          	beqz	t4,80000a28 <fail>
+80000a44:	342020f3          	csrr	ra,mcause
+80000a48:	341020f3          	csrr	ra,mepc
+80000a4c:	300020f3          	csrr	ra,mstatus
+80000a50:	343020f3          	csrr	ra,mbadaddr
+80000a54:	08000093          	li	ra,128
+80000a58:	3000b073          	csrc	mstatus,ra
+80000a5c:	00200093          	li	ra,2
+80000a60:	fc1e8ae3          	beq	t4,ra,80000a34 <pass>
+80000a64:	000020b7          	lui	ra,0x2
+80000a68:	80008093          	addi	ra,ra,-2048 # 1800 <_start-0x7fffe800>
+80000a6c:	3000a073          	csrs	mstatus,ra
+80000a70:	341f1073          	csrw	mepc,t5
+80000a74:	30200073          	mret
+
+80000a78 <strap>:
+80000a78:	fa0e88e3          	beqz	t4,80000a28 <fail>
+80000a7c:	142020f3          	csrr	ra,scause
+80000a80:	141020f3          	csrr	ra,sepc
+80000a84:	100020f3          	csrr	ra,sstatus
+80000a88:	143020f3          	csrr	ra,sbadaddr
+80000a8c:	00000073          	ecall
+80000a90:	00000013          	nop
+80000a94:	00000013          	nop
+80000a98:	00000013          	nop
+80000a9c:	00000013          	nop
+80000aa0:	00000013          	nop
+80000aa4:	00000013          	nop
diff --git a/src/test/cpp/raw/deleg/build/deleg.hex b/src/test/cpp/raw/deleg/build/deleg.hex
index ba5fc06..9290e85 100644
--- a/src/test/cpp/raw/deleg/build/deleg.hex
+++ b/src/test/cpp/raw/deleg/build/deleg.hex
@@ -1,122 +1,174 @@
 :0200000480007A
-:10000000930E1000970000009380C06F73905030E3
-:10001000970000009380807273905010B71001F029
-:100020001301000023A02000130E1000170F000082
-:10003000130FCF0073000000130E2000B720000044
-:10004000938000801301000073B0003073200130F2
-:1000500097000000938040017390103473002030AB
-:100060006F008068170F0000130F4F02730000002D
-:100070006F008067130E3000170F0000130F0F0181
-:10008000832010006F004066130E4000B720000070
-:1000900093800080371100001301018073B000309D
-:1000A000732001309700000093804001739010345A
-:1000B000730020306F004063170F0000130F0F0113
-:1000C000832010006F004062130E5000B720000024
-:1000D000938000801301000073B000307320013062
-:1000E000970000009380400173901034730020301B
-:1000F0006F00805F170F0000130F0F0183201000A7
-:100100006F00805E130E600093000001739020303A
-:10011000130E7000170F0000130F0F018320100043
-:100120006F00805C130E8000170F0000130FCF03C9
-:10013000B720000093800080371100001301018078
-:1001400073B00030732001309700000093804001AD
-:1001500073901034730020306F000059832010001A
-:100160006F008058130E9000170F0000130F8F03BD
-:10017000B7200000938000801301000073B00030AE
-:100180007320013097000000938040017390103479
-:10019000730020306F004055832010006F00C05462
-:1001A000130EA000170F0000130FCF03B71001F0BC
-:1001B0001301000023A02000930080007390003002
-:1001C000B71000009380008073904030B71001F0AA
-:1001D0001301100023A02000730050106F00C050C6
-:1001E000130EB000170F0000130F8F06B71001F0A9
-:1001F0001301000023A020009300800073900030C2
-:10020000B71000009380008073904030B72000004A
-:1002100093800080371100001301018073B000301B
-:1002200073200130970000009380400173901034D8
-:10023000730020306F00404BB71001F01301100025
-:1002400023A02000730050106F00004A130EC0005E
-:10025000170F0000130F4F06B71001F01301000035
-:1002600023A020009300800073900030B71000009E
-:100270009380008073904030B7200000938000800E
-:100280001301000073B000307320013097000000AC
-:100290009380400173901034730020306F00C0448D
-:1002A000B71001F01301100023A0200073005010BC
-:1002B0006F0080439300200073900010130EE00045
-:1002C000170F0000130F0F04B72001F013010000F7
-:1002D00023A02000930020007390003093000020A2
-:1002E00073904030930E0000B72001F0130110000E
-:1002F00023A02000930040069380F0FFE34E10FE01
-:10030000130EF000170F0000130F8F06B72001F037
-:100310001301000023A02000930020007390003000
-:100320009300002073904030B7200000938000803D
-:10033000371100001301018073B0003073200130C9
-:1003400097000000938040017390103473002030B8
-:100350006F008039930E1000B72001F013011000D8
-:1003600023A02000730050106F000038130E00010E
-:10037000170F0000130F0F06B72001F01301000044
-:1003800023A02000930020007390003093000020F1
-:1003900073904030B720000093800080130100006C
-:1003A00073B000307320013097000000938040014B
-:1003B00073901034730020306F000033B72001F0C9
-:1003C0001301100023A02000730050106F00C031F3
-:1003D000130E10019300002073903030170F0000AF
-:1003E000130F0F04B72001F01301000023A0200019
-:1003F00093002000739000309300002073904030F1
-:10040000930E0000B72001F01301100023A020007C
-:10041000930040069380F0FFE34E10FE130E200180
-:10042000170F0000130F8F06B72001F01301000013
-:1004300023A0200093002000739000309300002040
-:1004400073904030B7200000938000803711000087
-:100450001301018073B00030732001309700000059
-:100460009380400173901034730020306F00C027D8
-:10047000930E1000B72001F01301100023A02000FC
-:10048000730050106F004026130E3001170F00004C
-:10049000130F0F06B72001F01301000023A0200066
-:1004A0009300200073900030930000207390403040
-:1004B000B7200000938000801301000073B000306B
-:1004C0007320013097000000938040017390103436
-:1004D000730020306F004021B72001F0130110009D
-:1004E00023A02000730050106F000020B72001F0FF
-:1004F0001301000023A02000130E4001170F00007D
-:10050000130F0F039300200073900030930000201E
-:1005100073904030930E00009300002073A04014AD
-:10052000930040069380F0FFE34E10FE130E50013F
-:10053000170F0000130F0F069300002073B0401434
-:10054000930020007390003093000020739040309F
-:10055000B720000093800080371100001301018054
-:1005600073B0003073200130970000009380400189
-:1005700073901034730020306F000017930E10003A
-:100580009300002073A04014730050106F00C0153A
-:10059000130E6001170F0000130F8F05930000204A
-:1005A00073B040149300200073900030930000203B
-:1005B000739040309300002073A04014B7200000D7
-:1005C000938000801301000073B00030732001306D
-:1005D0009700000093804001739010347300203026
-:1005E0006F008010730050106F000010130E700128
-:1005F000930E0000B72001F01301000023A020009B
-:100600009300002073B04014F3214034B72001F070
-:100610001301100023A020009300002073B04014A9
-:10062000F3214034B72001F01301000023A0200083
-:100630009300002073B04014F3214034B72001F040
-:100640001301000023A020009300002073A0401499
-:10065000F3214034B72001F01301100023A0200043
-:100660009300002073A04014F3214034B72001F020
-:100670001301000023A02000130E8001930020002E
-:1006800073A0403073A0403473A00030930E10006C
-:10069000170F0000130FCF03B720000093800080D6
-:1006A000371100001301018073B000307320013056
-:1006B0009700000093804001739010347300203045
-:1006C0006F008002730050106F000002130E900143
-:1006D000170F0000130F4F017360043073005010A8
-:1006E0006F0080006F000001370110F0130141F22C
-:1006F0002320C101370110F0130101F22320010072
-:10070000E3840EFEF3202034F3201034F320003075
-:10071000F32030349300000873B0003093002000C1
-:10072000E38A1EFCB72000009380008073A0003095
-:1007300073101F3473002030E3880EFAF320201466
-:10074000F3201014F3200010F32030147300000085
-:10075000130000001300000013000000130000004D
-:0807600013000000130000006B
+:10000000930E1000971000009380C0A3739050309F
+:1000100097100000938080A673905010B71001F0E5
+:100020001301000023A020001300000013000000B3
+:100030001300000013000000130000001300000074
+:100040001300000013000000130E1000170F000033
+:10005000130FCF0073000000130E2000B720000024
+:10006000938000801301000073B0003073200130D2
+:10007000970000009380400173901034730020308B
+:100080006F00901A170F0000130F4F02730000004B
+:100090006F009019130E3000170F0000130F0F019F
+:1000A000832010006F005018130E4000B72000008E
+:1000B00093800080371100001301018073B000307D
+:1000C000732001309700000093804001739010343A
+:1000D000730020306F005015170F0000130F0F0131
+:1000E000832010006F005014130E5000B720000042
+:1000F000938000801301000073B000307320013042
+:1001000097000000938040017390103473002030FA
+:100110006F009011170F0000130F0F0183201000C4
+:100120006F009010130E6000930000017390203058
+:10013000130E7000170F0000130F0F018320100023
+:100140006F00900E130E8000170F0000130FCF03E7
+:10015000B720000093800080371100001301018058
+:1001600073B000307320013097000000938040018D
+:1001700073901034730020306F00100B8320100038
+:100180006F00900A130E9000170F0000130F8F03DB
+:10019000B7200000938000801301000073B000308E
+:1001A0007320013097000000938040017390103459
+:1001B000730020306F005007832010006F00D006BE
+:1001C000130EA000170F0000130FCF07B71001F098
+:1001D0001301000023A02000130000001300000002
+:1001E00013000000130000001300000013000000C3
+:1001F0001300000013000000930080007390003093
+:10020000B71000009380008073904030B71001F069
+:100210001301100023A020001300000013000000B1
+:100220001300000013000000130000001300000082
+:100230001300000013000000730050106F00C07E18
+:10024000130EB000170F0000130F8F0AB71001F044
+:100250001301000023A02000130000001300000081
+:100260001300000013000000130000001300000042
+:100270001300000013000000930080007390003012
+:10028000B71000009380008073904030B7200000CA
+:1002900093800080371100001301018073B000309B
+:1002A0007320013097000000938040017390103458
+:1002B000730020306F004077B71001F01301100079
+:1002C00023A0200013000000130000001300000012
+:1002D00013000000130000001300000013000000D2
+:1002E00013000000730050106F000074130EC00064
+:1002F000170F0000130F4F0AB71001F01301000091
+:1003000023A02000130000001300000013000000D1
+:100310001300000013000000130000001300000091
+:10032000130000009300800073900030B7100000AD
+:100330009380008073904030B7200000938000804D
+:100340001301000073B000307320013097000000EB
+:100350009380400173901034730020306F00C06CA4
+:10036000B71001F01301100023A0200013000000BB
+:100370001300000013000000130000001300000031
+:100380001300000013000000130000007300501061
+:100390006F0080699300200073900010130EE0003E
+:1003A000170F0000130F0F08B72001F01301000012
+:1003B00023A0200013000000130000001300000021
+:1003C00013000000130000001300000013000000E1
+:1003D0001300000093002000739000309300002071
+:1003E00073904030930E0000B72001F0130110000D
+:1003F00023A02000130000001300000013000000E1
+:1004000013000000130000001300000013000000A0
+:1004100013000000930040069380F0FFE34E10FEAF
+:10042000130EF000170F0000130F8F0AB72001F012
+:100430001301000023A0200013000000130000009F
+:100440001300000013000000130000001300000060
+:100450001300000013000000930020007390003090
+:100460009300002073904030B720000093800080FC
+:10047000371100001301018073B000307320013088
+:100480009700000093804001739010347300203077
+:100490006F008059930E1000B72001F01301100077
+:1004A00023A0200013000000130000001300000030
+:1004B00013000000130000001300000013000000F0
+:1004C00013000000730050106F000056130E00015F
+:1004D000170F0000130F0F0AB72001F013010000DF
+:1004E00023A02000130000001300000013000000F0
+:1004F00013000000130000001300000013000000B0
+:10050000130000009300200073900030930000203F
+:1005100073904030B72000009380008013010000EA
+:1005200073B00030732001309700000093804001C9
+:1005300073901034730020306F00004FB72001F02B
+:100540001301100023A0200013000000130000007E
+:10055000130000001300000013000000130000004F
+:100560001300000013000000730050106F00C04B18
+:10057000130E10019300002073903030170F00000D
+:10058000130F0F08B72001F01301000023A0200073
+:10059000130000001300000013000000130000000F
+:1005A00013000000130000001300000013000000FF
+:1005B000930020007390003093000020739040302F
+:1005C000930E0000B72001F01301100023A02000BB
+:1005D00013000000130000001300000013000000CF
+:1005E00013000000130000001300000013000000BF
+:1005F000930040069380F0FFE34E10FE130E20019F
+:10060000170F0000130F8F0AB72001F0130100002D
+:1006100023A02000130000001300000013000000BE
+:10062000130000001300000013000000130000007E
+:10063000130000009300200073900030930000200E
+:1006400073904030B7200000938000803711000085
+:100650001301018073B00030732001309700000057
+:100660009380400173901034730020306F00C03BC2
+:10067000930E1000B72001F01301100023A02000FA
+:10068000130000001300000013000000130000001E
+:10069000130000001300000013000000130000000E
+:1006A000730050106F004038130E3001170F000018
+:1006B000130F0F0AB72001F01301000023A0200040
+:1006C00013000000130000001300000013000000DE
+:1006D00013000000130000001300000013000000CE
+:1006E00093002000739000309300002073904030FE
+:1006F000B7200000938000801301000073B0003029
+:1007000073200130970000009380400173901034F3
+:10071000730020306F004031B72001F0130110004A
+:1007200023A02000130000001300000013000000AD
+:10073000130000001300000013000000130000006D
+:1007400013000000730050106F00002EB72001F05E
+:100750001301000023A0200013000000130000007C
+:10076000130000001300000013000000130000003D
+:100770001300000013000000130E4001170F0000CB
+:10078000130F0F039300200073900030930000209C
+:1007900073904030930E00009300002073A040142B
+:1007A000930040069380F0FFE34E10FE130E5001BD
+:1007B000170F0000130F0F069300002073B04014B2
+:1007C000930020007390003093000020739040301D
+:1007D000B7200000938000803711000013010180D2
+:1007E00073B0003073200130970000009380400107
+:1007F00073901034730020306F000023930E1000AC
+:100800009300002073A04014730050106F00C021AB
+:10081000130E6001170F0000130F8F0593000020C7
+:1008200073B04014930020007390003093000020B8
+:10083000739040309300002073A04014B720000054
+:10084000938000801301000073B0003073200130EA
+:1008500097000000938040017390103473002030A3
+:100860006F00801C730050106F00001C130E70018D
+:10087000930E0000B72001F01301000023A0200018
+:10088000130000001300000013000000130000001C
+:10089000130000001300000013000000130000000C
+:1008A0009300002073B04014F3214034B72001F0CE
+:1008B0001301100023A0200013000000130000000B
+:1008C00013000000130000001300000013000000DC
+:1008D00013000000130000009300002073B04014C8
+:1008E000F3214034B72001F01301000023A02000C1
+:1008F00013000000130000001300000013000000AC
+:10090000130000001300000013000000130000009B
+:100910009300002073B04014F3214034B72001F05D
+:100920001301000023A020001300000013000000AA
+:10093000130000001300000013000000130000006B
+:1009400013000000130000009300002073A0401467
+:10095000F3214034B72001F01301100023A0200040
+:10096000130000001300000013000000130000003B
+:10097000130000001300000013000000130000002B
+:100980009300002073A04014F3214034B72001F0FD
+:100990001301000023A0200013000000130000003A
+:1009A00013000000130000001300000013000000FB
+:1009B0001300000013000000130E800193002000BC
+:1009C00073A0403073A0403473A00030930E100029
+:1009D000170F0000130FCF03B72000009380008093
+:1009E000371100001301018073B000307320013013
+:1009F0009700000093804001739010347300203002
+:100A00006F008002730050106F000002130E9001FF
+:100A1000170F0000130F4F01736004307300501064
+:100A20006F0080006F000001370110F0130141F2E8
+:100A30002320C101370110F0130101F2232001002E
+:100A4000E3840EFEF3202034F3201034F320003032
+:100A5000F32030349300000873B00030930020007E
+:100A6000E38A1EFCB72000009380008073A0003052
+:100A700073101F3473002030E3880EFAF320201423
+:100A8000F3201014F3200010F32030147300000042
+:100A9000130000001300000013000000130000000A
+:080AA000130000001300000028
 :040000058000000077
 :00000001FF
diff --git a/src/test/cpp/raw/deleg/src/crt.S b/src/test/cpp/raw/deleg/src/crt.S
index 86dd58f..f88d13f 100644
--- a/src/test/cpp/raw/deleg/src/crt.S
+++ b/src/test/cpp/raw/deleg/src/crt.S
@@ -10,11 +10,28 @@
     li x1, 0xF0011000; \
     li x2, value; \
     sw x2, 0(x1); \
+    nop; \
+    nop; \
+    nop; \
+    nop; \
+    nop; \
+    nop; \
+    nop; \
+    nop; \
+
 
 #define externalInterruptS(value) \
     li x1, 0xF0012000; \
     li x2, value; \
     sw x2, 0(x1); \
+    nop; \
+    nop; \
+    nop; \
+    nop; \
+    nop; \
+    nop; \
+    nop; \
+    nop; \