drm/amdkfd: Fix lost single step exceptions in gfx9 trap handler

If the trap is entered due to MODE.DEBUG_EN=1 and SAVECTX is raised
concurrently the handler cannot identify the source of the exception.
This causes the debugger to lose single step exception notification
when a context save request arrives at the same time.

When MODE.DEBUG_EN=1 and STATUS.HALT=0 (exception not already handled)
jump to the second-level trap handler upon entering the trap. The
second-level trap will set STATUS.HALT=1 and return to the shader.
If SAVECTX was raised then control flow will return to the trap, which
will then handle the context save request.

Cc: Tony Tye <tony.tye@amd.com>
Cc: Laurent Morichetti <laurent.morichetti@amd.com>
Cc: Qingchuan Shi <qingchuan.shi@amd.com>
Signed-off-by: Jay Cornwall <jay.cornwall@amd.com>
Reviewed-by: Laurent Morichetti <laurent.morichetti@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
index 7274baff5c167fed92670c2ff80ce1579e1249ca..427594035597c51de8eeb0ee808c602b32bfac9d 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
+++ b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
@@ -274,405 +274,409 @@ static const uint32_t cwsr_trap_gfx8_hex[] = {
 
 
 static const uint32_t cwsr_trap_gfx9_hex[] = {
-       0xbf820001, 0xbf820241,
+       0xbf820001, 0xbf820248,
        0xb8f8f802, 0x89788678,
-       0xb8fbf803, 0x866eff7b,
-       0x00000400, 0xbf85003b,
-       0x866eff7b, 0x00000800,
-       0xbf850003, 0x866eff7b,
-       0x00000100, 0xbf84000c,
+       0xb8eef801, 0x866eff6e,
+       0x00000800, 0xbf840003,
        0x866eff78, 0x00002000,
-       0xbf840005, 0xbf8e0010,
-       0xb8eef803, 0x866eff6e,
-       0x00000400, 0xbf84fffb,
-       0x8778ff78, 0x00002000,
-       0x80ec886c, 0x82ed806d,
-       0xb8eef807, 0x866fff6e,
-       0x001f8000, 0x8e6f8b6f,
-       0x8977ff77, 0xfc000000,
-       0x87776f77, 0x896eff6e,
-       0x001f8000, 0xb96ef807,
-       0xb8faf812, 0xb8fbf813,
-       0x8efa887a, 0xc0071bbd,
-       0x00000000, 0xbf8cc07f,
-       0xc0071ebd, 0x00000008,
-       0xbf8cc07f, 0x86ee6e6e,
-       0xbf840001, 0xbe801d6e,
-       0xb8fbf803, 0x867bff7b,
-       0x000001ff, 0xbf850002,
-       0x806c846c, 0x826d806d,
+       0xbf840016, 0xb8fbf803,
+       0x866eff7b, 0x00000400,
+       0xbf85003b, 0x866eff7b,
+       0x00000800, 0xbf850003,
+       0x866eff7b, 0x00000100,
+       0xbf84000c, 0x866eff78,
+       0x00002000, 0xbf840005,
+       0xbf8e0010, 0xb8eef803,
+       0x866eff6e, 0x00000400,
+       0xbf84fffb, 0x8778ff78,
+       0x00002000, 0x80ec886c,
+       0x82ed806d, 0xb8eef807,
+       0x866fff6e, 0x001f8000,
+       0x8e6f8b6f, 0x8977ff77,
+       0xfc000000, 0x87776f77,
+       0x896eff6e, 0x001f8000,
+       0xb96ef807, 0xb8faf812,
+       0xb8fbf813, 0x8efa887a,
+       0xc0071bbd, 0x00000000,
+       0xbf8cc07f, 0xc0071ebd,
+       0x00000008, 0xbf8cc07f,
+       0x86ee6e6e, 0xbf840001,
+       0xbe801d6e, 0xb8fbf803,
+       0x867bff7b, 0x000001ff,
+       0xbf850002, 0x806c846c,
+       0x826d806d, 0x866dff6d,
+       0x0000ffff, 0x8f6e8b77,
+       0x866eff6e, 0x001f8000,
+       0xb96ef807, 0x86fe7e7e,
+       0x86ea6a6a, 0x8f6e8378,
+       0xb96ee0c2, 0xbf800002,
+       0xb9780002, 0xbe801f6c,
        0x866dff6d, 0x0000ffff,
-       0x8f6e8b77, 0x866eff6e,
-       0x001f8000, 0xb96ef807,
-       0x86fe7e7e, 0x86ea6a6a,
-       0x8f6e8378, 0xb96ee0c2,
-       0xbf800002, 0xb9780002,
-       0xbe801f6c, 0x866dff6d,
-       0x0000ffff, 0xbefa0080,
-       0xb97a0283, 0xb8fa2407,
-       0x8e7a9b7a, 0x876d7a6d,
-       0xb8fa03c7, 0x8e7a9a7a,
-       0x876d7a6d, 0xb8faf807,
-       0x867aff7a, 0x00007fff,
-       0xb97af807, 0xbeee007e,
-       0xbeef007f, 0xbefe0180,
-       0xbf900004, 0x877a8478,
-       0xb97af802, 0xbf8e0002,
-       0xbf88fffe, 0xb8fa2a05,
-       0x807a817a, 0x8e7a8a7a,
-       0xb8fb1605, 0x807b817b,
-       0x8e7b867b, 0x807a7b7a,
-       0x807a7e7a, 0x827b807f,
-       0x867bff7b, 0x0000ffff,
-       0xc04b1c3d, 0x00000050,
-       0xbf8cc07f, 0xc04b1d3d,
-       0x00000060, 0xbf8cc07f,
-       0xc0431e7d, 0x00000074,
-       0xbf8cc07f, 0xbef4007e,
-       0x8675ff7f, 0x0000ffff,
-       0x8775ff75, 0x00040000,
-       0xbef60080, 0xbef700ff,
-       0x00807fac, 0x867aff7f,
-       0x08000000, 0x8f7a837a,
-       0x87777a77, 0x867aff7f,
-       0x70000000, 0x8f7a817a,
-       0x87777a77, 0xbef1007c,
-       0xbef00080, 0xb8f02a05,
-       0x80708170, 0x8e708a70,
-       0xb8fa1605, 0x807a817a,
-       0x8e7a867a, 0x80707a70,
-       0xbef60084, 0xbef600ff,
-       0x01000000, 0xbefe007c,
-       0xbefc0070, 0xc0611c7a,
-       0x0000007c, 0xbf8cc07f,
-       0x80708470, 0xbefc007e,
+       0xbefa0080, 0xb97a0283,
+       0xb8fa2407, 0x8e7a9b7a,
+       0x876d7a6d, 0xb8fa03c7,
+       0x8e7a9a7a, 0x876d7a6d,
+       0xb8faf807, 0x867aff7a,
+       0x00007fff, 0xb97af807,
+       0xbeee007e, 0xbeef007f,
+       0xbefe0180, 0xbf900004,
+       0x877a8478, 0xb97af802,
+       0xbf8e0002, 0xbf88fffe,
+       0xb8fa2a05, 0x807a817a,
+       0x8e7a8a7a, 0xb8fb1605,
+       0x807b817b, 0x8e7b867b,
+       0x807a7b7a, 0x807a7e7a,
+       0x827b807f, 0x867bff7b,
+       0x0000ffff, 0xc04b1c3d,
+       0x00000050, 0xbf8cc07f,
+       0xc04b1d3d, 0x00000060,
+       0xbf8cc07f, 0xc0431e7d,
+       0x00000074, 0xbf8cc07f,
+       0xbef4007e, 0x8675ff7f,
+       0x0000ffff, 0x8775ff75,
+       0x00040000, 0xbef60080,
+       0xbef700ff, 0x00807fac,
+       0x867aff7f, 0x08000000,
+       0x8f7a837a, 0x87777a77,
+       0x867aff7f, 0x70000000,
+       0x8f7a817a, 0x87777a77,
+       0xbef1007c, 0xbef00080,
+       0xb8f02a05, 0x80708170,
+       0x8e708a70, 0xb8fa1605,
+       0x807a817a, 0x8e7a867a,
+       0x80707a70, 0xbef60084,
+       0xbef600ff, 0x01000000,
        0xbefe007c, 0xbefc0070,
-       0xc0611b3a, 0x0000007c,
+       0xc0611c7a, 0x0000007c,
        0xbf8cc07f, 0x80708470,
        0xbefc007e, 0xbefe007c,
-       0xbefc0070, 0xc0611b7a,
+       0xbefc0070, 0xc0611b3a,
        0x0000007c, 0xbf8cc07f,
        0x80708470, 0xbefc007e,
        0xbefe007c, 0xbefc0070,
-       0xc0611bba, 0x0000007c,
+       0xc0611b7a, 0x0000007c,
        0xbf8cc07f, 0x80708470,
        0xbefc007e, 0xbefe007c,
-       0xbefc0070, 0xc0611bfa,
+       0xbefc0070, 0xc0611bba,
        0x0000007c, 0xbf8cc07f,
        0x80708470, 0xbefc007e,
        0xbefe007c, 0xbefc0070,
-       0xc0611e3a, 0x0000007c,
-       0xbf8cc07f, 0x80708470,
-       0xbefc007e, 0xb8fbf803,
-       0xbefe007c, 0xbefc0070,
-       0xc0611efa, 0x0000007c,
+       0xc0611bfa, 0x0000007c,
        0xbf8cc07f, 0x80708470,
        0xbefc007e, 0xbefe007c,
-       0xbefc0070, 0xc0611a3a,
+       0xbefc0070, 0xc0611e3a,
+       0x0000007c, 0xbf8cc07f,
+       0x80708470, 0xbefc007e,
+       0xb8fbf803, 0xbefe007c,
+       0xbefc0070, 0xc0611efa,
        0x0000007c, 0xbf8cc07f,
        0x80708470, 0xbefc007e,
        0xbefe007c, 0xbefc0070,
-       0xc0611a7a, 0x0000007c,
-       0xbf8cc07f, 0x80708470,
-       0xbefc007e, 0xb8f1f801,
-       0xbefe007c, 0xbefc0070,
-       0xc0611c7a, 0x0000007c,
+       0xc0611a3a, 0x0000007c,
        0xbf8cc07f, 0x80708470,
-       0xbefc007e, 0x867aff7f,
-       0x04000000, 0xbeef0080,
-       0x876f6f7a, 0xb8f02a05,
-       0x80708170, 0x8e708a70,
-       0xb8fb1605, 0x807b817b,
-       0x8e7b847b, 0x8e76827b,
-       0xbef600ff, 0x01000000,
-       0xbef20174, 0x80747074,
-       0x82758075, 0xbefc0080,
-       0xbf800000, 0xbe802b00,
-       0xbe822b02, 0xbe842b04,
-       0xbe862b06, 0xbe882b08,
-       0xbe8a2b0a, 0xbe8c2b0c,
-       0xbe8e2b0e, 0xc06b003a,
-       0x00000000, 0xbf8cc07f,
-       0xc06b013a, 0x00000010,
-       0xbf8cc07f, 0xc06b023a,
-       0x00000020, 0xbf8cc07f,
-       0xc06b033a, 0x00000030,
-       0xbf8cc07f, 0x8074c074,
-       0x82758075, 0x807c907c,
-       0xbf0a7b7c, 0xbf85ffe7,
-       0xbef40172, 0xbef00080,
-       0xbefe00c1, 0xbeff00c1,
-       0xbee80080, 0xbee90080,
-       0xbef600ff, 0x01000000,
-       0x867aff78, 0x00400000,
-       0xbf850003, 0xb8faf803,
-       0x897a7aff, 0x10000000,
-       0xbf85004d, 0xbe840080,
-       0xd2890000, 0x00000900,
-       0x80048104, 0xd2890001,
-       0x00000900, 0x80048104,
-       0xd2890002, 0x00000900,
-       0x80048104, 0xd2890003,
-       0x00000900, 0x80048104,
-       0xc069003a, 0x00000070,
-       0xbf8cc07f, 0x80709070,
-       0xbf06c004, 0xbf84ffee,
+       0xbefc007e, 0xbefe007c,
+       0xbefc0070, 0xc0611a7a,
+       0x0000007c, 0xbf8cc07f,
+       0x80708470, 0xbefc007e,
+       0xb8f1f801, 0xbefe007c,
+       0xbefc0070, 0xc0611c7a,
+       0x0000007c, 0xbf8cc07f,
+       0x80708470, 0xbefc007e,
+       0x867aff7f, 0x04000000,
+       0xbeef0080, 0x876f6f7a,
+       0xb8f02a05, 0x80708170,
+       0x8e708a70, 0xb8fb1605,
+       0x807b817b, 0x8e7b847b,
+       0x8e76827b, 0xbef600ff,
+       0x01000000, 0xbef20174,
+       0x80747074, 0x82758075,
+       0xbefc0080, 0xbf800000,
+       0xbe802b00, 0xbe822b02,
+       0xbe842b04, 0xbe862b06,
+       0xbe882b08, 0xbe8a2b0a,
+       0xbe8c2b0c, 0xbe8e2b0e,
+       0xc06b003a, 0x00000000,
+       0xbf8cc07f, 0xc06b013a,
+       0x00000010, 0xbf8cc07f,
+       0xc06b023a, 0x00000020,
+       0xbf8cc07f, 0xc06b033a,
+       0x00000030, 0xbf8cc07f,
+       0x8074c074, 0x82758075,
+       0x807c907c, 0xbf0a7b7c,
+       0xbf85ffe7, 0xbef40172,
+       0xbef00080, 0xbefe00c1,
+       0xbeff00c1, 0xbee80080,
+       0xbee90080, 0xbef600ff,
+       0x01000000, 0x867aff78,
+       0x00400000, 0xbf850003,
+       0xb8faf803, 0x897a7aff,
+       0x10000000, 0xbf85004d,
        0xbe840080, 0xd2890000,
-       0x00000901, 0x80048104,
-       0xd2890001, 0x00000901,
+       0x00000900, 0x80048104,
+       0xd2890001, 0x00000900,
        0x80048104, 0xd2890002,
-       0x00000901, 0x80048104,
-       0xd2890003, 0x00000901,
+       0x00000900, 0x80048104,
+       0xd2890003, 0x00000900,
        0x80048104, 0xc069003a,
        0x00000070, 0xbf8cc07f,
        0x80709070, 0xbf06c004,
        0xbf84ffee, 0xbe840080,
-       0xd2890000, 0x00000902,
+       0xd2890000, 0x00000901,
        0x80048104, 0xd2890001,
-       0x00000902, 0x80048104,
-       0xd2890002, 0x00000902,
+       0x00000901, 0x80048104,
+       0xd2890002, 0x00000901,
        0x80048104, 0xd2890003,
-       0x00000902, 0x80048104,
+       0x00000901, 0x80048104,
        0xc069003a, 0x00000070,
        0xbf8cc07f, 0x80709070,
        0xbf06c004, 0xbf84ffee,
        0xbe840080, 0xd2890000,
-       0x00000903, 0x80048104,
-       0xd2890001, 0x00000903,
+       0x00000902, 0x80048104,
+       0xd2890001, 0x00000902,
        0x80048104, 0xd2890002,
-       0x00000903, 0x80048104,
-       0xd2890003, 0x00000903,
+       0x00000902, 0x80048104,
+       0xd2890003, 0x00000902,
        0x80048104, 0xc069003a,
        0x00000070, 0xbf8cc07f,
        0x80709070, 0xbf06c004,
-       0xbf84ffee, 0xbf820008,
-       0xe0724000, 0x701d0000,
-       0xe0724100, 0x701d0100,
-       0xe0724200, 0x701d0200,
-       0xe0724300, 0x701d0300,
-       0xbefe00c1, 0xbeff00c1,
-       0xb8fb4306, 0x867bc17b,
-       0xbf840063, 0xbf8a0000,
-       0x867aff6f, 0x04000000,
-       0xbf84005f, 0x8e7b867b,
-       0x8e7b827b, 0xbef6007b,
-       0xb8f02a05, 0x80708170,
-       0x8e708a70, 0xb8fa1605,
-       0x807a817a, 0x8e7a867a,
-       0x80707a70, 0x8070ff70,
-       0x00000080, 0xbef600ff,
-       0x01000000, 0xbefc0080,
-       0xd28c0002, 0x000100c1,
-       0xd28d0003, 0x000204c1,
-       0x867aff78, 0x00400000,
-       0xbf850003, 0xb8faf803,
-       0x897a7aff, 0x10000000,
-       0xbf850030, 0x24040682,
-       0xd86e4000, 0x00000002,
-       0xbf8cc07f, 0xbe840080,
-       0xd2890000, 0x00000900,
+       0xbf84ffee, 0xbe840080,
+       0xd2890000, 0x00000903,
        0x80048104, 0xd2890001,
-       0x00000900, 0x80048104,
-       0xd2890002, 0x00000900,
+       0x00000903, 0x80048104,
+       0xd2890002, 0x00000903,
        0x80048104, 0xd2890003,
-       0x00000900, 0x80048104,
+       0x00000903, 0x80048104,
        0xc069003a, 0x00000070,
        0xbf8cc07f, 0x80709070,
        0xbf06c004, 0xbf84ffee,
+       0xbf820008, 0xe0724000,
+       0x701d0000, 0xe0724100,
+       0x701d0100, 0xe0724200,
+       0x701d0200, 0xe0724300,
+       0x701d0300, 0xbefe00c1,
+       0xbeff00c1, 0xb8fb4306,
+       0x867bc17b, 0xbf840063,
+       0xbf8a0000, 0x867aff6f,
+       0x04000000, 0xbf84005f,
+       0x8e7b867b, 0x8e7b827b,
+       0xbef6007b, 0xb8f02a05,
+       0x80708170, 0x8e708a70,
+       0xb8fa1605, 0x807a817a,
+       0x8e7a867a, 0x80707a70,
+       0x8070ff70, 0x00000080,
+       0xbef600ff, 0x01000000,
+       0xbefc0080, 0xd28c0002,
+       0x000100c1, 0xd28d0003,
+       0x000204c1, 0x867aff78,
+       0x00400000, 0xbf850003,
+       0xb8faf803, 0x897a7aff,
+       0x10000000, 0xbf850030,
+       0x24040682, 0xd86e4000,
+       0x00000002, 0xbf8cc07f,
        0xbe840080, 0xd2890000,
-       0x00000901, 0x80048104,
-       0xd2890001, 0x00000901,
+       0x00000900, 0x80048104,
+       0xd2890001, 0x00000900,
        0x80048104, 0xd2890002,
-       0x00000901, 0x80048104,
-       0xd2890003, 0x00000901,
+       0x00000900, 0x80048104,
+       0xd2890003, 0x00000900,
        0x80048104, 0xc069003a,
        0x00000070, 0xbf8cc07f,
        0x80709070, 0xbf06c004,
-       0xbf84ffee, 0x680404ff,
-       0x00000200, 0xd0c9006a,
-       0x0000f702, 0xbf87ffd2,
-       0xbf820015, 0xd1060002,
-       0x00011103, 0x7e0602ff,
-       0x00000200, 0xbefc00ff,
-       0x00010000, 0xbe800077,
-       0x8677ff77, 0xff7fffff,
-       0x8777ff77, 0x00058000,
-       0xd8ec0000, 0x00000002,
-       0xbf8cc07f, 0xe0765000,
-       0x701d0002, 0x68040702,
-       0xd0c9006a, 0x0000f702,
-       0xbf87fff7, 0xbef70000,
-       0xbef000ff, 0x00000400,
-       0xbefe00c1, 0xbeff00c1,
-       0xb8fb2a05, 0x807b817b,
-       0x8e7b827b, 0x8e76887b,
-       0xbef600ff, 0x01000000,
-       0xbefc0084, 0xbf0a7b7c,
-       0xbf84006d, 0xbf11017c,
-       0x807bff7b, 0x00001000,
-       0x867aff78, 0x00400000,
-       0xbf850003, 0xb8faf803,
-       0x897a7aff, 0x10000000,
-       0xbf850051, 0xbe840080,
-       0xd2890000, 0x00000900,
+       0xbf84ffee, 0xbe840080,
+       0xd2890000, 0x00000901,
        0x80048104, 0xd2890001,
-       0x00000900, 0x80048104,
-       0xd2890002, 0x00000900,
+       0x00000901, 0x80048104,
+       0xd2890002, 0x00000901,
        0x80048104, 0xd2890003,
-       0x00000900, 0x80048104,
+       0x00000901, 0x80048104,
        0xc069003a, 0x00000070,
        0xbf8cc07f, 0x80709070,
        0xbf06c004, 0xbf84ffee,
+       0x680404ff, 0x00000200,
+       0xd0c9006a, 0x0000f702,
+       0xbf87ffd2, 0xbf820015,
+       0xd1060002, 0x00011103,
+       0x7e0602ff, 0x00000200,
+       0xbefc00ff, 0x00010000,
+       0xbe800077, 0x8677ff77,
+       0xff7fffff, 0x8777ff77,
+       0x00058000, 0xd8ec0000,
+       0x00000002, 0xbf8cc07f,
+       0xe0765000, 0x701d0002,
+       0x68040702, 0xd0c9006a,
+       0x0000f702, 0xbf87fff7,
+       0xbef70000, 0xbef000ff,
+       0x00000400, 0xbefe00c1,
+       0xbeff00c1, 0xb8fb2a05,
+       0x807b817b, 0x8e7b827b,
+       0x8e76887b, 0xbef600ff,
+       0x01000000, 0xbefc0084,
+       0xbf0a7b7c, 0xbf84006d,
+       0xbf11017c, 0x807bff7b,
+       0x00001000, 0x867aff78,
+       0x00400000, 0xbf850003,
+       0xb8faf803, 0x897a7aff,
+       0x10000000, 0xbf850051,
        0xbe840080, 0xd2890000,
-       0x00000901, 0x80048104,
-       0xd2890001, 0x00000901,
+       0x00000900, 0x80048104,
+       0xd2890001, 0x00000900,
        0x80048104, 0xd2890002,
-       0x00000901, 0x80048104,
-       0xd2890003, 0x00000901,
+       0x00000900, 0x80048104,
+       0xd2890003, 0x00000900,
        0x80048104, 0xc069003a,
        0x00000070, 0xbf8cc07f,
        0x80709070, 0xbf06c004,
        0xbf84ffee, 0xbe840080,
-       0xd2890000, 0x00000902,
+       0xd2890000, 0x00000901,
        0x80048104, 0xd2890001,
-       0x00000902, 0x80048104,
-       0xd2890002, 0x00000902,
+       0x00000901, 0x80048104,
+       0xd2890002, 0x00000901,
        0x80048104, 0xd2890003,
-       0x00000902, 0x80048104,
+       0x00000901, 0x80048104,
        0xc069003a, 0x00000070,
        0xbf8cc07f, 0x80709070,
        0xbf06c004, 0xbf84ffee,
        0xbe840080, 0xd2890000,
-       0x00000903, 0x80048104,
-       0xd2890001, 0x00000903,
+       0x00000902, 0x80048104,
+       0xd2890001, 0x00000902,
        0x80048104, 0xd2890002,
-       0x00000903, 0x80048104,
-       0xd2890003, 0x00000903,
+       0x00000902, 0x80048104,
+       0xd2890003, 0x00000902,
        0x80048104, 0xc069003a,
        0x00000070, 0xbf8cc07f,
        0x80709070, 0xbf06c004,
-       0xbf84ffee, 0x807c847c,
-       0xbf0a7b7c, 0xbf85ffb1,
-       0xbf9c0000, 0xbf820012,
-       0x7e000300, 0x7e020301,
-       0x7e040302, 0x7e060303,
-       0xe0724000, 0x701d0000,
-       0xe0724100, 0x701d0100,
-       0xe0724200, 0x701d0200,
-       0xe0724300, 0x701d0300,
-       0x807c847c, 0x8070ff70,
-       0x00000400, 0xbf0a7b7c,
-       0xbf85ffef, 0xbf9c0000,
-       0xbf8200da, 0xbef4007e,
-       0x8675ff7f, 0x0000ffff,
-       0x8775ff75, 0x00040000,
-       0xbef60080, 0xbef700ff,
-       0x00807fac, 0x866eff7f,
-       0x08000000, 0x8f6e836e,
-       0x87776e77, 0x866eff7f,
-       0x70000000, 0x8f6e816e,
-       0x87776e77, 0x866eff7f,
-       0x04000000, 0xbf84001e,
-       0xbefe00c1, 0xbeff00c1,
-       0xb8ef4306, 0x866fc16f,
-       0xbf840019, 0x8e6f866f,
-       0x8e6f826f, 0xbef6006f,
-       0xb8f82a05, 0x80788178,
-       0x8e788a78, 0xb8ee1605,
-       0x806e816e, 0x8e6e866e,
-       0x80786e78, 0x8078ff78,
-       0x00000080, 0xbef600ff,
-       0x01000000, 0xbefc0080,
-       0xe0510000, 0x781d0000,
-       0xe0510100, 0x781d0000,
-       0x807cff7c, 0x00000200,
-       0x8078ff78, 0x00000200,
-       0xbf0a6f7c, 0xbf85fff6,
-       0xbef80080, 0xbefe00c1,
-       0xbeff00c1, 0xb8ef2a05,
-       0x806f816f, 0x8e6f826f,
-       0x8e76886f, 0xbef600ff,
-       0x01000000, 0xbeee0078,
-       0x8078ff78, 0x00000400,
-       0xbefc0084, 0xbf11087c,
-       0x806fff6f, 0x00008000,
-       0xe0524000, 0x781d0000,
-       0xe0524100, 0x781d0100,
-       0xe0524200, 0x781d0200,
-       0xe0524300, 0x781d0300,
-       0xbf8c0f70, 0x7e000300,
+       0xbf84ffee, 0xbe840080,
+       0xd2890000, 0x00000903,
+       0x80048104, 0xd2890001,
+       0x00000903, 0x80048104,
+       0xd2890002, 0x00000903,
+       0x80048104, 0xd2890003,
+       0x00000903, 0x80048104,
+       0xc069003a, 0x00000070,
+       0xbf8cc07f, 0x80709070,
+       0xbf06c004, 0xbf84ffee,
+       0x807c847c, 0xbf0a7b7c,
+       0xbf85ffb1, 0xbf9c0000,
+       0xbf820012, 0x7e000300,
        0x7e020301, 0x7e040302,
-       0x7e060303, 0x807c847c,
-       0x8078ff78, 0x00000400,
-       0xbf0a6f7c, 0xbf85ffee,
-       0xbf9c0000, 0xe0524000,
-       0x6e1d0000, 0xe0524100,
-       0x6e1d0100, 0xe0524200,
-       0x6e1d0200, 0xe0524300,
-       0x6e1d0300, 0xb8f82a05,
+       0x7e060303, 0xe0724000,
+       0x701d0000, 0xe0724100,
+       0x701d0100, 0xe0724200,
+       0x701d0200, 0xe0724300,
+       0x701d0300, 0x807c847c,
+       0x8070ff70, 0x00000400,
+       0xbf0a7b7c, 0xbf85ffef,
+       0xbf9c0000, 0xbf8200da,
+       0xbef4007e, 0x8675ff7f,
+       0x0000ffff, 0x8775ff75,
+       0x00040000, 0xbef60080,
+       0xbef700ff, 0x00807fac,
+       0x866eff7f, 0x08000000,
+       0x8f6e836e, 0x87776e77,
+       0x866eff7f, 0x70000000,
+       0x8f6e816e, 0x87776e77,
+       0x866eff7f, 0x04000000,
+       0xbf84001e, 0xbefe00c1,
+       0xbeff00c1, 0xb8ef4306,
+       0x866fc16f, 0xbf840019,
+       0x8e6f866f, 0x8e6f826f,
+       0xbef6006f, 0xb8f82a05,
        0x80788178, 0x8e788a78,
        0xb8ee1605, 0x806e816e,
        0x8e6e866e, 0x80786e78,
-       0x80f8c078, 0xb8ef1605,
-       0x806f816f, 0x8e6f846f,
-       0x8e76826f, 0xbef600ff,
-       0x01000000, 0xbefc006f,
-       0xc031003a, 0x00000078,
-       0x80f8c078, 0xbf8cc07f,
-       0x80fc907c, 0xbf800000,
-       0xbe802d00, 0xbe822d02,
-       0xbe842d04, 0xbe862d06,
-       0xbe882d08, 0xbe8a2d0a,
-       0xbe8c2d0c, 0xbe8e2d0e,
-       0xbf06807c, 0xbf84fff0,
+       0x8078ff78, 0x00000080,
+       0xbef600ff, 0x01000000,
+       0xbefc0080, 0xe0510000,
+       0x781d0000, 0xe0510100,
+       0x781d0000, 0x807cff7c,
+       0x00000200, 0x8078ff78,
+       0x00000200, 0xbf0a6f7c,
+       0xbf85fff6, 0xbef80080,
+       0xbefe00c1, 0xbeff00c1,
+       0xb8ef2a05, 0x806f816f,
+       0x8e6f826f, 0x8e76886f,
+       0xbef600ff, 0x01000000,
+       0xbeee0078, 0x8078ff78,
+       0x00000400, 0xbefc0084,
+       0xbf11087c, 0x806fff6f,
+       0x00008000, 0xe0524000,
+       0x781d0000, 0xe0524100,
+       0x781d0100, 0xe0524200,
+       0x781d0200, 0xe0524300,
+       0x781d0300, 0xbf8c0f70,
+       0x7e000300, 0x7e020301,
+       0x7e040302, 0x7e060303,
+       0x807c847c, 0x8078ff78,
+       0x00000400, 0xbf0a6f7c,
+       0xbf85ffee, 0xbf9c0000,
+       0xe0524000, 0x6e1d0000,
+       0xe0524100, 0x6e1d0100,
+       0xe0524200, 0x6e1d0200,
+       0xe0524300, 0x6e1d0300,
        0xb8f82a05, 0x80788178,
        0x8e788a78, 0xb8ee1605,
        0x806e816e, 0x8e6e866e,
-       0x80786e78, 0xbef60084,
+       0x80786e78, 0x80f8c078,
+       0xb8ef1605, 0x806f816f,
+       0x8e6f846f, 0x8e76826f,
        0xbef600ff, 0x01000000,
-       0xc0211bfa, 0x00000078,
-       0x80788478, 0xc0211b3a,
+       0xbefc006f, 0xc031003a,
+       0x00000078, 0x80f8c078,
+       0xbf8cc07f, 0x80fc907c,
+       0xbf800000, 0xbe802d00,
+       0xbe822d02, 0xbe842d04,
+       0xbe862d06, 0xbe882d08,
+       0xbe8a2d0a, 0xbe8c2d0c,
+       0xbe8e2d0e, 0xbf06807c,
+       0xbf84fff0, 0xb8f82a05,
+       0x80788178, 0x8e788a78,
+       0xb8ee1605, 0x806e816e,
+       0x8e6e866e, 0x80786e78,
+       0xbef60084, 0xbef600ff,
+       0x01000000, 0xc0211bfa,
        0x00000078, 0x80788478,
-       0xc0211b7a, 0x00000078,
-       0x80788478, 0xc0211c3a,
+       0xc0211b3a, 0x00000078,
+       0x80788478, 0xc0211b7a,
        0x00000078, 0x80788478,
-       0xc0211c7a, 0x00000078,
-       0x80788478, 0xc0211eba,
+       0xc0211c3a, 0x00000078,
+       0x80788478, 0xc0211c7a,
        0x00000078, 0x80788478,
-       0xc0211efa, 0x00000078,
-       0x80788478, 0xc0211a3a,
+       0xc0211eba, 0x00000078,
+       0x80788478, 0xc0211efa,
        0x00000078, 0x80788478,
-       0xc0211a7a, 0x00000078,
-       0x80788478, 0xc0211cfa,
+       0xc0211a3a, 0x00000078,
+       0x80788478, 0xc0211a7a,
        0x00000078, 0x80788478,
-       0xbf8cc07f, 0xbefc006f,
-       0xbefe0070, 0xbeff0071,
-       0x866f7bff, 0x000003ff,
-       0xb96f4803, 0x866f7bff,
-       0xfffff800, 0x8f6f8b6f,
-       0xb96fa2c3, 0xb973f801,
-       0xb8ee2a05, 0x806e816e,
-       0x8e6e8a6e, 0xb8ef1605,
-       0x806f816f, 0x8e6f866f,
-       0x806e6f6e, 0x806e746e,
-       0x826f8075, 0x866fff6f,
-       0x0000ffff, 0xc00b1c37,
-       0x00000050, 0xc00b1d37,
-       0x00000060, 0xc0031e77,
-       0x00000074, 0xbf8cc07f,
-       0x866fff6d, 0xf8000000,
-       0x8f6f9b6f, 0x8e6f906f,
-       0xbeee0080, 0x876e6f6e,
-       0x866fff6d, 0x04000000,
-       0x8f6f9a6f, 0x8e6f8f6f,
-       0x876e6f6e, 0x866fff7a,
-       0x00800000, 0x8f6f976f,
-       0xb96ef807, 0x866dff6d,
-       0x0000ffff, 0x86fe7e7e,
-       0x86ea6a6a, 0x8f6e837a,
-       0xb96ee0c2, 0xbf800002,
-       0xb97a0002, 0xbf8a0000,
-       0x95806f6c, 0xbf810000,
+       0xc0211cfa, 0x00000078,
+       0x80788478, 0xbf8cc07f,
+       0xbefc006f, 0xbefe0070,
+       0xbeff0071, 0x866f7bff,
+       0x000003ff, 0xb96f4803,
+       0x866f7bff, 0xfffff800,
+       0x8f6f8b6f, 0xb96fa2c3,
+       0xb973f801, 0xb8ee2a05,
+       0x806e816e, 0x8e6e8a6e,
+       0xb8ef1605, 0x806f816f,
+       0x8e6f866f, 0x806e6f6e,
+       0x806e746e, 0x826f8075,
+       0x866fff6f, 0x0000ffff,
+       0xc00b1c37, 0x00000050,
+       0xc00b1d37, 0x00000060,
+       0xc0031e77, 0x00000074,
+       0xbf8cc07f, 0x866fff6d,
+       0xf8000000, 0x8f6f9b6f,
+       0x8e6f906f, 0xbeee0080,
+       0x876e6f6e, 0x866fff6d,
+       0x04000000, 0x8f6f9a6f,
+       0x8e6f8f6f, 0x876e6f6e,
+       0x866fff7a, 0x00800000,
+       0x8f6f976f, 0xb96ef807,
+       0x866dff6d, 0x0000ffff,
+       0x86fe7e7e, 0x86ea6a6a,
+       0x8f6e837a, 0xb96ee0c2,
+       0xbf800002, 0xb97a0002,
+       0xbf8a0000, 0x95806f6c,
+       0xbf810000, 0x00000000,
 };
 
 static const uint32_t cwsr_trap_gfx10_hex[] = {
@@ -974,248 +978,145 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {
        0xbf9f0000, 0x00000000,
 };
 static const uint32_t cwsr_trap_arcturus_hex[] = {
-       0xbf820001, 0xbf8202bd,
+       0xbf820001, 0xbf8202c4,
        0xb8f8f802, 0x89788678,
-       0xb8fbf803, 0x866eff7b,
-       0x00000400, 0xbf85003b,
-       0x866eff7b, 0x00000800,
-       0xbf850003, 0x866eff7b,
-       0x00000100, 0xbf84000c,
+       0xb8eef801, 0x866eff6e,
+       0x00000800, 0xbf840003,
        0x866eff78, 0x00002000,
-       0xbf840005, 0xbf8e0010,
-       0xb8eef803, 0x866eff6e,
-       0x00000400, 0xbf84fffb,
-       0x8778ff78, 0x00002000,
-       0x80ec886c, 0x82ed806d,
-       0xb8eef807, 0x866fff6e,
-       0x001f8000, 0x8e6f8b6f,
-       0x8977ff77, 0xfc000000,
-       0x87776f77, 0x896eff6e,
-       0x001f8000, 0xb96ef807,
-       0xb8faf812, 0xb8fbf813,
-       0x8efa887a, 0xc0071bbd,
-       0x00000000, 0xbf8cc07f,
-       0xc0071ebd, 0x00000008,
-       0xbf8cc07f, 0x86ee6e6e,
-       0xbf840001, 0xbe801d6e,
-       0xb8fbf803, 0x867bff7b,
-       0x000001ff, 0xbf850002,
-       0x806c846c, 0x826d806d,
+       0xbf840016, 0xb8fbf803,
+       0x866eff7b, 0x00000400,
+       0xbf85003b, 0x866eff7b,
+       0x00000800, 0xbf850003,
+       0x866eff7b, 0x00000100,
+       0xbf84000c, 0x866eff78,
+       0x00002000, 0xbf840005,
+       0xbf8e0010, 0xb8eef803,
+       0x866eff6e, 0x00000400,
+       0xbf84fffb, 0x8778ff78,
+       0x00002000, 0x80ec886c,
+       0x82ed806d, 0xb8eef807,
+       0x866fff6e, 0x001f8000,
+       0x8e6f8b6f, 0x8977ff77,
+       0xfc000000, 0x87776f77,
+       0x896eff6e, 0x001f8000,
+       0xb96ef807, 0xb8faf812,
+       0xb8fbf813, 0x8efa887a,
+       0xc0071bbd, 0x00000000,
+       0xbf8cc07f, 0xc0071ebd,
+       0x00000008, 0xbf8cc07f,
+       0x86ee6e6e, 0xbf840001,
+       0xbe801d6e, 0xb8fbf803,
+       0x867bff7b, 0x000001ff,
+       0xbf850002, 0x806c846c,
+       0x826d806d, 0x866dff6d,
+       0x0000ffff, 0x8f6e8b77,
+       0x866eff6e, 0x001f8000,
+       0xb96ef807, 0x86fe7e7e,
+       0x86ea6a6a, 0x8f6e8378,
+       0xb96ee0c2, 0xbf800002,
+       0xb9780002, 0xbe801f6c,
        0x866dff6d, 0x0000ffff,
-       0x8f6e8b77, 0x866eff6e,
-       0x001f8000, 0xb96ef807,
-       0x86fe7e7e, 0x86ea6a6a,
-       0x8f6e8378, 0xb96ee0c2,
-       0xbf800002, 0xb9780002,
-       0xbe801f6c, 0x866dff6d,
-       0x0000ffff, 0xbefa0080,
-       0xb97a0283, 0xb8fa2407,
-       0x8e7a9b7a, 0x876d7a6d,
-       0xb8fa03c7, 0x8e7a9a7a,
-       0x876d7a6d, 0xb8faf807,
-       0x867aff7a, 0x00007fff,
-       0xb97af807, 0xbeee007e,
-       0xbeef007f, 0xbefe0180,
-       0xbf900004, 0x877a8478,
-       0xb97af802, 0xbf8e0002,
-       0xbf88fffe, 0xb8fa2a05,
-       0x807a817a, 0x8e7a8a7a,
-       0x8e7a817a, 0xb8fb1605,
-       0x807b817b, 0x8e7b867b,
-       0x807a7b7a, 0x807a7e7a,
-       0x827b807f, 0x867bff7b,
-       0x0000ffff, 0xc04b1c3d,
-       0x00000050, 0xbf8cc07f,
-       0xc04b1d3d, 0x00000060,
-       0xbf8cc07f, 0xc0431e7d,
-       0x00000074, 0xbf8cc07f,
-       0xbef4007e, 0x8675ff7f,
-       0x0000ffff, 0x8775ff75,
-       0x00040000, 0xbef60080,
-       0xbef700ff, 0x00807fac,
-       0x867aff7f, 0x08000000,
-       0x8f7a837a, 0x87777a77,
-       0x867aff7f, 0x70000000,
-       0x8f7a817a, 0x87777a77,
-       0xbef1007c, 0xbef00080,
-       0xb8f02a05, 0x80708170,
-       0x8e708a70, 0x8e708170,
-       0xb8fa1605, 0x807a817a,
-       0x8e7a867a, 0x80707a70,
-       0xbef60084, 0xbef600ff,
-       0x01000000, 0xbefe007c,
-       0xbefc0070, 0xc0611c7a,
-       0x0000007c, 0xbf8cc07f,
-       0x80708470, 0xbefc007e,
+       0xbefa0080, 0xb97a0283,
+       0xb8fa2407, 0x8e7a9b7a,
+       0x876d7a6d, 0xb8fa03c7,
+       0x8e7a9a7a, 0x876d7a6d,
+       0xb8faf807, 0x867aff7a,
+       0x00007fff, 0xb97af807,
+       0xbeee007e, 0xbeef007f,
+       0xbefe0180, 0xbf900004,
+       0x877a8478, 0xb97af802,
+       0xbf8e0002, 0xbf88fffe,
+       0xb8fa2a05, 0x807a817a,
+       0x8e7a8a7a, 0x8e7a817a,
+       0xb8fb1605, 0x807b817b,
+       0x8e7b867b, 0x807a7b7a,
+       0x807a7e7a, 0x827b807f,
+       0x867bff7b, 0x0000ffff,
+       0xc04b1c3d, 0x00000050,
+       0xbf8cc07f, 0xc04b1d3d,
+       0x00000060, 0xbf8cc07f,
+       0xc0431e7d, 0x00000074,
+       0xbf8cc07f, 0xbef4007e,
+       0x8675ff7f, 0x0000ffff,
+       0x8775ff75, 0x00040000,
+       0xbef60080, 0xbef700ff,
+       0x00807fac, 0x867aff7f,
+       0x08000000, 0x8f7a837a,
+       0x87777a77, 0x867aff7f,
+       0x70000000, 0x8f7a817a,
+       0x87777a77, 0xbef1007c,
+       0xbef00080, 0xb8f02a05,
+       0x80708170, 0x8e708a70,
+       0x8e708170, 0xb8fa1605,
+       0x807a817a, 0x8e7a867a,
+       0x80707a70, 0xbef60084,
+       0xbef600ff, 0x01000000,
        0xbefe007c, 0xbefc0070,
-       0xc0611b3a, 0x0000007c,
+       0xc0611c7a, 0x0000007c,
        0xbf8cc07f, 0x80708470,
        0xbefc007e, 0xbefe007c,
-       0xbefc0070, 0xc0611b7a,
+       0xbefc0070, 0xc0611b3a,
        0x0000007c, 0xbf8cc07f,
        0x80708470, 0xbefc007e,
        0xbefe007c, 0xbefc0070,
-       0xc0611bba, 0x0000007c,
+       0xc0611b7a, 0x0000007c,
        0xbf8cc07f, 0x80708470,
        0xbefc007e, 0xbefe007c,
-       0xbefc0070, 0xc0611bfa,
+       0xbefc0070, 0xc0611bba,
        0x0000007c, 0xbf8cc07f,
        0x80708470, 0xbefc007e,
        0xbefe007c, 0xbefc0070,
-       0xc0611e3a, 0x0000007c,
-       0xbf8cc07f, 0x80708470,
-       0xbefc007e, 0xb8fbf803,
-       0xbefe007c, 0xbefc0070,
-       0xc0611efa, 0x0000007c,
+       0xc0611bfa, 0x0000007c,
        0xbf8cc07f, 0x80708470,
        0xbefc007e, 0xbefe007c,
-       0xbefc0070, 0xc0611a3a,
+       0xbefc0070, 0xc0611e3a,
+       0x0000007c, 0xbf8cc07f,
+       0x80708470, 0xbefc007e,
+       0xb8fbf803, 0xbefe007c,
+       0xbefc0070, 0xc0611efa,
        0x0000007c, 0xbf8cc07f,
        0x80708470, 0xbefc007e,
        0xbefe007c, 0xbefc0070,
-       0xc0611a7a, 0x0000007c,
-       0xbf8cc07f, 0x80708470,
-       0xbefc007e, 0xb8f1f801,
-       0xbefe007c, 0xbefc0070,
-       0xc0611c7a, 0x0000007c,
+       0xc0611a3a, 0x0000007c,
        0xbf8cc07f, 0x80708470,
-       0xbefc007e, 0x867aff7f,
-       0x04000000, 0xbeef0080,
-       0x876f6f7a, 0xb8f02a05,
-       0x80708170, 0x8e708a70,
-       0x8e708170, 0xb8fb1605,
-       0x807b817b, 0x8e7b847b,
-       0x8e76827b, 0xbef600ff,
-       0x01000000, 0xbef20174,
-       0x80747074, 0x82758075,
-       0xbefc0080, 0xbf800000,
-       0xbe802b00, 0xbe822b02,
-       0xbe842b04, 0xbe862b06,
-       0xbe882b08, 0xbe8a2b0a,
-       0xbe8c2b0c, 0xbe8e2b0e,
-       0xc06b003a, 0x00000000,
-       0xbf8cc07f, 0xc06b013a,
-       0x00000010, 0xbf8cc07f,
-       0xc06b023a, 0x00000020,
-       0xbf8cc07f, 0xc06b033a,
-       0x00000030, 0xbf8cc07f,
-       0x8074c074, 0x82758075,
-       0x807c907c, 0xbf0a7b7c,
-       0xbf85ffe7, 0xbef40172,
-       0xbef00080, 0xbefe00c1,
-       0xbeff00c1, 0xbee80080,
-       0xbee90080, 0xbef600ff,
-       0x01000000, 0x867aff78,
-       0x00400000, 0xbf850003,
-       0xb8faf803, 0x897a7aff,
-       0x10000000, 0xbf85004d,
-       0xbe840080, 0xd2890000,
-       0x00000900, 0x80048104,
-       0xd2890001, 0x00000900,
-       0x80048104, 0xd2890002,
-       0x00000900, 0x80048104,
-       0xd2890003, 0x00000900,
-       0x80048104, 0xc069003a,
-       0x00000070, 0xbf8cc07f,
-       0x80709070, 0xbf06c004,
-       0xbf84ffee, 0xbe840080,
-       0xd2890000, 0x00000901,
-       0x80048104, 0xd2890001,
-       0x00000901, 0x80048104,
-       0xd2890002, 0x00000901,
-       0x80048104, 0xd2890003,
-       0x00000901, 0x80048104,
-       0xc069003a, 0x00000070,
-       0xbf8cc07f, 0x80709070,
-       0xbf06c004, 0xbf84ffee,
-       0xbe840080, 0xd2890000,
-       0x00000902, 0x80048104,
-       0xd2890001, 0x00000902,
-       0x80048104, 0xd2890002,
-       0x00000902, 0x80048104,
-       0xd2890003, 0x00000902,
-       0x80048104, 0xc069003a,
-       0x00000070, 0xbf8cc07f,
-       0x80709070, 0xbf06c004,
-       0xbf84ffee, 0xbe840080,
-       0xd2890000, 0x00000903,
-       0x80048104, 0xd2890001,
-       0x00000903, 0x80048104,
-       0xd2890002, 0x00000903,
-       0x80048104, 0xd2890003,
-       0x00000903, 0x80048104,
-       0xc069003a, 0x00000070,
-       0xbf8cc07f, 0x80709070,
-       0xbf06c004, 0xbf84ffee,
-       0xbf820008, 0xe0724000,
-       0x701d0000, 0xe0724100,
-       0x701d0100, 0xe0724200,
-       0x701d0200, 0xe0724300,
-       0x701d0300, 0xbefe00c1,
-       0xbeff00c1, 0xb8fb4306,
-       0x867bc17b, 0xbf840064,
-       0xbf8a0000, 0x867aff6f,
-       0x04000000, 0xbf840060,
-       0x8e7b867b, 0x8e7b827b,
-       0xbef6007b, 0xb8f02a05,
-       0x80708170, 0x8e708a70,
-       0x8e708170, 0xb8fa1605,
-       0x807a817a, 0x8e7a867a,
-       0x80707a70, 0x8070ff70,
-       0x00000080, 0xbef600ff,
-       0x01000000, 0xbefc0080,
-       0xd28c0002, 0x000100c1,
-       0xd28d0003, 0x000204c1,
-       0x867aff78, 0x00400000,
-       0xbf850003, 0xb8faf803,
-       0x897a7aff, 0x10000000,
-       0xbf850030, 0x24040682,
-       0xd86e4000, 0x00000002,
-       0xbf8cc07f, 0xbe840080,
-       0xd2890000, 0x00000900,
-       0x80048104, 0xd2890001,
-       0x00000900, 0x80048104,
-       0xd2890002, 0x00000900,
-       0x80048104, 0xd2890003,
-       0x00000900, 0x80048104,
-       0xc069003a, 0x00000070,
-       0xbf8cc07f, 0x80709070,
-       0xbf06c004, 0xbf84ffee,
-       0xbe840080, 0xd2890000,
-       0x00000901, 0x80048104,
-       0xd2890001, 0x00000901,
-       0x80048104, 0xd2890002,
-       0x00000901, 0x80048104,
-       0xd2890003, 0x00000901,
-       0x80048104, 0xc069003a,
-       0x00000070, 0xbf8cc07f,
-       0x80709070, 0xbf06c004,
-       0xbf84ffee, 0x680404ff,
-       0x00000200, 0xd0c9006a,
-       0x0000f702, 0xbf87ffd2,
-       0xbf820015, 0xd1060002,
-       0x00011103, 0x7e0602ff,
-       0x00000200, 0xbefc00ff,
-       0x00010000, 0xbe800077,
-       0x8677ff77, 0xff7fffff,
-       0x8777ff77, 0x00058000,
-       0xd8ec0000, 0x00000002,
-       0xbf8cc07f, 0xe0765000,
-       0x701d0002, 0x68040702,
-       0xd0c9006a, 0x0000f702,
-       0xbf87fff7, 0xbef70000,
-       0xbef000ff, 0x00000400,
+       0xbefc007e, 0xbefe007c,
+       0xbefc0070, 0xc0611a7a,
+       0x0000007c, 0xbf8cc07f,
+       0x80708470, 0xbefc007e,
+       0xb8f1f801, 0xbefe007c,
+       0xbefc0070, 0xc0611c7a,
+       0x0000007c, 0xbf8cc07f,
+       0x80708470, 0xbefc007e,
+       0x867aff7f, 0x04000000,
+       0xbeef0080, 0x876f6f7a,
+       0xb8f02a05, 0x80708170,
+       0x8e708a70, 0x8e708170,
+       0xb8fb1605, 0x807b817b,
+       0x8e7b847b, 0x8e76827b,
+       0xbef600ff, 0x01000000,
+       0xbef20174, 0x80747074,
+       0x82758075, 0xbefc0080,
+       0xbf800000, 0xbe802b00,
+       0xbe822b02, 0xbe842b04,
+       0xbe862b06, 0xbe882b08,
+       0xbe8a2b0a, 0xbe8c2b0c,
+       0xbe8e2b0e, 0xc06b003a,
+       0x00000000, 0xbf8cc07f,
+       0xc06b013a, 0x00000010,
+       0xbf8cc07f, 0xc06b023a,
+       0x00000020, 0xbf8cc07f,
+       0xc06b033a, 0x00000030,
+       0xbf8cc07f, 0x8074c074,
+       0x82758075, 0x807c907c,
+       0xbf0a7b7c, 0xbf85ffe7,
+       0xbef40172, 0xbef00080,
        0xbefe00c1, 0xbeff00c1,
-       0xb8fb2a05, 0x807b817b,
-       0x8e7b827b, 0x8e76887b,
+       0xbee80080, 0xbee90080,
        0xbef600ff, 0x01000000,
-       0xbefc0084, 0xbf0a7b7c,
-       0xbf84006d, 0xbf11017c,
-       0x807bff7b, 0x00001000,
        0x867aff78, 0x00400000,
        0xbf850003, 0xb8faf803,
        0x897a7aff, 0x10000000,
-       0xbf850051, 0xbe840080,
+       0xbf85004d, 0xbe840080,
        0xd2890000, 0x00000900,
        0x80048104, 0xd2890001,
        0x00000900, 0x80048104,
@@ -1253,208 +1154,315 @@ static const uint32_t cwsr_trap_arcturus_hex[] = {
        0x80048104, 0xc069003a,
        0x00000070, 0xbf8cc07f,
        0x80709070, 0xbf06c004,
-       0xbf84ffee, 0x807c847c,
-       0xbf0a7b7c, 0xbf85ffb1,
-       0xbf9c0000, 0xbf820012,
-       0x7e000300, 0x7e020301,
-       0x7e040302, 0x7e060303,
+       0xbf84ffee, 0xbf820008,
        0xe0724000, 0x701d0000,
        0xe0724100, 0x701d0100,
        0xe0724200, 0x701d0200,
        0xe0724300, 0x701d0300,
-       0x807c847c, 0x8070ff70,
-       0x00000400, 0xbf0a7b7c,
-       0xbf85ffef, 0xbf9c0000,
-       0xbefc0080, 0xbf11017c,
-       0x867aff78, 0x00400000,
-       0xbf850003, 0xb8faf803,
-       0x897a7aff, 0x10000000,
-       0xbf850059, 0xd3d84000,
-       0x18000100, 0xd3d84001,
-       0x18000101, 0xd3d84002,
-       0x18000102, 0xd3d84003,
-       0x18000103, 0xbe840080,
-       0xd2890000, 0x00000900,
-       0x80048104, 0xd2890001,
+       0xbefe00c1, 0xbeff00c1,
+       0xb8fb4306, 0x867bc17b,
+       0xbf840064, 0xbf8a0000,
+       0x867aff6f, 0x04000000,
+       0xbf840060, 0x8e7b867b,
+       0x8e7b827b, 0xbef6007b,
+       0xb8f02a05, 0x80708170,
+       0x8e708a70, 0x8e708170,
+       0xb8fa1605, 0x807a817a,
+       0x8e7a867a, 0x80707a70,
+       0x8070ff70, 0x00000080,
+       0xbef600ff, 0x01000000,
+       0xbefc0080, 0xd28c0002,
+       0x000100c1, 0xd28d0003,
+       0x000204c1, 0x867aff78,
+       0x00400000, 0xbf850003,
+       0xb8faf803, 0x897a7aff,
+       0x10000000, 0xbf850030,
+       0x24040682, 0xd86e4000,
+       0x00000002, 0xbf8cc07f,
+       0xbe840080, 0xd2890000,
        0x00000900, 0x80048104,
-       0xd2890002, 0x00000900,
-       0x80048104, 0xd2890003,
+       0xd2890001, 0x00000900,
+       0x80048104, 0xd2890002,
        0x00000900, 0x80048104,
+       0xd2890003, 0x00000900,
+       0x80048104, 0xc069003a,
+       0x00000070, 0xbf8cc07f,
+       0x80709070, 0xbf06c004,
+       0xbf84ffee, 0xbe840080,
+       0xd2890000, 0x00000901,
+       0x80048104, 0xd2890001,
+       0x00000901, 0x80048104,
+       0xd2890002, 0x00000901,
+       0x80048104, 0xd2890003,
+       0x00000901, 0x80048104,
        0xc069003a, 0x00000070,
        0xbf8cc07f, 0x80709070,
        0xbf06c004, 0xbf84ffee,
+       0x680404ff, 0x00000200,
+       0xd0c9006a, 0x0000f702,
+       0xbf87ffd2, 0xbf820015,
+       0xd1060002, 0x00011103,
+       0x7e0602ff, 0x00000200,
+       0xbefc00ff, 0x00010000,
+       0xbe800077, 0x8677ff77,
+       0xff7fffff, 0x8777ff77,
+       0x00058000, 0xd8ec0000,
+       0x00000002, 0xbf8cc07f,
+       0xe0765000, 0x701d0002,
+       0x68040702, 0xd0c9006a,
+       0x0000f702, 0xbf87fff7,
+       0xbef70000, 0xbef000ff,
+       0x00000400, 0xbefe00c1,
+       0xbeff00c1, 0xb8fb2a05,
+       0x807b817b, 0x8e7b827b,
+       0x8e76887b, 0xbef600ff,
+       0x01000000, 0xbefc0084,
+       0xbf0a7b7c, 0xbf84006d,
+       0xbf11017c, 0x807bff7b,
+       0x00001000, 0x867aff78,
+       0x00400000, 0xbf850003,
+       0xb8faf803, 0x897a7aff,
+       0x10000000, 0xbf850051,
        0xbe840080, 0xd2890000,
-       0x00000901, 0x80048104,
-       0xd2890001, 0x00000901,
+       0x00000900, 0x80048104,
+       0xd2890001, 0x00000900,
        0x80048104, 0xd2890002,
-       0x00000901, 0x80048104,
-       0xd2890003, 0x00000901,
+       0x00000900, 0x80048104,
+       0xd2890003, 0x00000900,
        0x80048104, 0xc069003a,
        0x00000070, 0xbf8cc07f,
        0x80709070, 0xbf06c004,
        0xbf84ffee, 0xbe840080,
-       0xd2890000, 0x00000902,
+       0xd2890000, 0x00000901,
        0x80048104, 0xd2890001,
-       0x00000902, 0x80048104,
-       0xd2890002, 0x00000902,
+       0x00000901, 0x80048104,
+       0xd2890002, 0x00000901,
        0x80048104, 0xd2890003,
-       0x00000902, 0x80048104,
+       0x00000901, 0x80048104,
        0xc069003a, 0x00000070,
        0xbf8cc07f, 0x80709070,
        0xbf06c004, 0xbf84ffee,
        0xbe840080, 0xd2890000,
-       0x00000903, 0x80048104,
-       0xd2890001, 0x00000903,
+       0x00000902, 0x80048104,
+       0xd2890001, 0x00000902,
        0x80048104, 0xd2890002,
-       0x00000903, 0x80048104,
-       0xd2890003, 0x00000903,
+       0x00000902, 0x80048104,
+       0xd2890003, 0x00000902,
        0x80048104, 0xc069003a,
        0x00000070, 0xbf8cc07f,
        0x80709070, 0xbf06c004,
-       0xbf84ffee, 0x807c847c,
-       0xbf0a7b7c, 0xbf85ffa9,
-       0xbf9c0000, 0xbf820016,
+       0xbf84ffee, 0xbe840080,
+       0xd2890000, 0x00000903,
+       0x80048104, 0xd2890001,
+       0x00000903, 0x80048104,
+       0xd2890002, 0x00000903,
+       0x80048104, 0xd2890003,
+       0x00000903, 0x80048104,
+       0xc069003a, 0x00000070,
+       0xbf8cc07f, 0x80709070,
+       0xbf06c004, 0xbf84ffee,
+       0x807c847c, 0xbf0a7b7c,
+       0xbf85ffb1, 0xbf9c0000,
+       0xbf820012, 0x7e000300,
+       0x7e020301, 0x7e040302,
+       0x7e060303, 0xe0724000,
+       0x701d0000, 0xe0724100,
+       0x701d0100, 0xe0724200,
+       0x701d0200, 0xe0724300,
+       0x701d0300, 0x807c847c,
+       0x8070ff70, 0x00000400,
+       0xbf0a7b7c, 0xbf85ffef,
+       0xbf9c0000, 0xbefc0080,
+       0xbf11017c, 0x867aff78,
+       0x00400000, 0xbf850003,
+       0xb8faf803, 0x897a7aff,
+       0x10000000, 0xbf850059,
        0xd3d84000, 0x18000100,
        0xd3d84001, 0x18000101,
        0xd3d84002, 0x18000102,
        0xd3d84003, 0x18000103,
-       0xe0724000, 0x701d0000,
-       0xe0724100, 0x701d0100,
-       0xe0724200, 0x701d0200,
-       0xe0724300, 0x701d0300,
-       0x807c847c, 0x8070ff70,
-       0x00000400, 0xbf0a7b7c,
-       0xbf85ffeb, 0xbf9c0000,
-       0xbf820106, 0xbef4007e,
-       0x8675ff7f, 0x0000ffff,
-       0x8775ff75, 0x00040000,
-       0xbef60080, 0xbef700ff,
-       0x00807fac, 0x866eff7f,
-       0x08000000, 0x8f6e836e,
-       0x87776e77, 0x866eff7f,
-       0x70000000, 0x8f6e816e,
-       0x87776e77, 0x866eff7f,
-       0x04000000, 0xbf84001f,
-       0xbefe00c1, 0xbeff00c1,
-       0xb8ef4306, 0x866fc16f,
-       0xbf84001a, 0x8e6f866f,
-       0x8e6f826f, 0xbef6006f,
-       0xb8f82a05, 0x80788178,
-       0x8e788a78, 0x8e788178,
-       0xb8ee1605, 0x806e816e,
-       0x8e6e866e, 0x80786e78,
-       0x8078ff78, 0x00000080,
+       0xbe840080, 0xd2890000,
+       0x00000900, 0x80048104,
+       0xd2890001, 0x00000900,
+       0x80048104, 0xd2890002,
+       0x00000900, 0x80048104,
+       0xd2890003, 0x00000900,
+       0x80048104, 0xc069003a,
+       0x00000070, 0xbf8cc07f,
+       0x80709070, 0xbf06c004,
+       0xbf84ffee, 0xbe840080,
+       0xd2890000, 0x00000901,
+       0x80048104, 0xd2890001,
+       0x00000901, 0x80048104,
+       0xd2890002, 0x00000901,
+       0x80048104, 0xd2890003,
+       0x00000901, 0x80048104,
+       0xc069003a, 0x00000070,
+       0xbf8cc07f, 0x80709070,
+       0xbf06c004, 0xbf84ffee,
+       0xbe840080, 0xd2890000,
+       0x00000902, 0x80048104,
+       0xd2890001, 0x00000902,
+       0x80048104, 0xd2890002,
+       0x00000902, 0x80048104,
+       0xd2890003, 0x00000902,
+       0x80048104, 0xc069003a,
+       0x00000070, 0xbf8cc07f,
+       0x80709070, 0xbf06c004,
+       0xbf84ffee, 0xbe840080,
+       0xd2890000, 0x00000903,
+       0x80048104, 0xd2890001,
+       0x00000903, 0x80048104,
+       0xd2890002, 0x00000903,
+       0x80048104, 0xd2890003,
+       0x00000903, 0x80048104,
+       0xc069003a, 0x00000070,
+       0xbf8cc07f, 0x80709070,
+       0xbf06c004, 0xbf84ffee,
+       0x807c847c, 0xbf0a7b7c,
+       0xbf85ffa9, 0xbf9c0000,
+       0xbf820016, 0xd3d84000,
+       0x18000100, 0xd3d84001,
+       0x18000101, 0xd3d84002,
+       0x18000102, 0xd3d84003,
+       0x18000103, 0xe0724000,
+       0x701d0000, 0xe0724100,
+       0x701d0100, 0xe0724200,
+       0x701d0200, 0xe0724300,
+       0x701d0300, 0x807c847c,
+       0x8070ff70, 0x00000400,
+       0xbf0a7b7c, 0xbf85ffeb,
+       0xbf9c0000, 0xbf820106,
+       0xbef4007e, 0x8675ff7f,
+       0x0000ffff, 0x8775ff75,
+       0x00040000, 0xbef60080,
+       0xbef700ff, 0x00807fac,
+       0x866eff7f, 0x08000000,
+       0x8f6e836e, 0x87776e77,
+       0x866eff7f, 0x70000000,
+       0x8f6e816e, 0x87776e77,
+       0x866eff7f, 0x04000000,
+       0xbf84001f, 0xbefe00c1,
+       0xbeff00c1, 0xb8ef4306,
+       0x866fc16f, 0xbf84001a,
+       0x8e6f866f, 0x8e6f826f,
+       0xbef6006f, 0xb8f82a05,
+       0x80788178, 0x8e788a78,
+       0x8e788178, 0xb8ee1605,
+       0x806e816e, 0x8e6e866e,
+       0x80786e78, 0x8078ff78,
+       0x00000080, 0xbef600ff,
+       0x01000000, 0xbefc0080,
+       0xe0510000, 0x781d0000,
+       0xe0510100, 0x781d0000,
+       0x807cff7c, 0x00000200,
+       0x8078ff78, 0x00000200,
+       0xbf0a6f7c, 0xbf85fff6,
+       0xbef80080, 0xbefe00c1,
+       0xbeff00c1, 0xb8ef2a05,
+       0x806f816f, 0x8e6f826f,
+       0x8e76886f, 0xbef90076,
        0xbef600ff, 0x01000000,
-       0xbefc0080, 0xe0510000,
-       0x781d0000, 0xe0510100,
-       0x781d0000, 0x807cff7c,
-       0x00000200, 0x8078ff78,
-       0x00000200, 0xbf0a6f7c,
-       0xbf85fff6, 0xbef80080,
-       0xbefe00c1, 0xbeff00c1,
-       0xb8ef2a05, 0x806f816f,
-       0x8e6f826f, 0x8e76886f,
-       0xbef90076, 0xbef600ff,
-       0x01000000, 0xbeee0078,
-       0x8078ff78, 0x00000400,
-       0xbef30079, 0x8079ff79,
-       0x00000400, 0xbefc0084,
-       0xbf11087c, 0x806fff6f,
-       0x00008000, 0xe0524000,
-       0x791d0000, 0xe0524100,
-       0x791d0100, 0xe0524200,
-       0x791d0200, 0xe0524300,
-       0x791d0300, 0x8079ff79,
-       0x00000400, 0xbf8c0f70,
-       0xd3d94000, 0x18000100,
-       0xd3d94001, 0x18000101,
-       0xd3d94002, 0x18000102,
-       0xd3d94003, 0x18000103,
-       0xe0524000, 0x781d0000,
-       0xe0524100, 0x781d0100,
-       0xe0524200, 0x781d0200,
-       0xe0524300, 0x781d0300,
-       0xbf8c0f70, 0x7e000300,
-       0x7e020301, 0x7e040302,
-       0x7e060303, 0x807c847c,
-       0x8078ff78, 0x00000400,
-       0xbf0a6f7c, 0xbf85ffdb,
-       0xbf9c0000, 0xe0524000,
-       0x731d0000, 0xe0524100,
-       0x731d0100, 0xe0524200,
-       0x731d0200, 0xe0524300,
-       0x731d0300, 0xbf8c0f70,
-       0xd3d94000, 0x18000100,
-       0xd3d94001, 0x18000101,
-       0xd3d94002, 0x18000102,
-       0xd3d94003, 0x18000103,
-       0xe0524000, 0x6e1d0000,
-       0xe0524100, 0x6e1d0100,
-       0xe0524200, 0x6e1d0200,
-       0xe0524300, 0x6e1d0300,
-       0xb8f82a05, 0x80788178,
-       0x8e788a78, 0x8e788178,
-       0xb8ee1605, 0x806e816e,
-       0x8e6e866e, 0x80786e78,
-       0x80f8c078, 0xb8ef1605,
-       0x806f816f, 0x8e6f846f,
-       0x8e76826f, 0xbef600ff,
-       0x01000000, 0xbefc006f,
-       0xc031003a, 0x00000078,
-       0x80f8c078, 0xbf8cc07f,
-       0x80fc907c, 0xbf800000,
-       0xbe802d00, 0xbe822d02,
-       0xbe842d04, 0xbe862d06,
-       0xbe882d08, 0xbe8a2d0a,
-       0xbe8c2d0c, 0xbe8e2d0e,
-       0xbf06807c, 0xbf84fff0,
-       0xb8f82a05, 0x80788178,
-       0x8e788a78, 0x8e788178,
-       0xb8ee1605, 0x806e816e,
-       0x8e6e866e, 0x80786e78,
-       0xbef60084, 0xbef600ff,
-       0x01000000, 0xc0211bfa,
+       0xbeee0078, 0x8078ff78,
+       0x00000400, 0xbef30079,
+       0x8079ff79, 0x00000400,
+       0xbefc0084, 0xbf11087c,
+       0x806fff6f, 0x00008000,
+       0xe0524000, 0x791d0000,
+       0xe0524100, 0x791d0100,
+       0xe0524200, 0x791d0200,
+       0xe0524300, 0x791d0300,
+       0x8079ff79, 0x00000400,
+       0xbf8c0f70, 0xd3d94000,
+       0x18000100, 0xd3d94001,
+       0x18000101, 0xd3d94002,
+       0x18000102, 0xd3d94003,
+       0x18000103, 0xe0524000,
+       0x781d0000, 0xe0524100,
+       0x781d0100, 0xe0524200,
+       0x781d0200, 0xe0524300,
+       0x781d0300, 0xbf8c0f70,
+       0x7e000300, 0x7e020301,
+       0x7e040302, 0x7e060303,
+       0x807c847c, 0x8078ff78,
+       0x00000400, 0xbf0a6f7c,
+       0xbf85ffdb, 0xbf9c0000,
+       0xe0524000, 0x731d0000,
+       0xe0524100, 0x731d0100,
+       0xe0524200, 0x731d0200,
+       0xe0524300, 0x731d0300,
+       0xbf8c0f70, 0xd3d94000,
+       0x18000100, 0xd3d94001,
+       0x18000101, 0xd3d94002,
+       0x18000102, 0xd3d94003,
+       0x18000103, 0xe0524000,
+       0x6e1d0000, 0xe0524100,
+       0x6e1d0100, 0xe0524200,
+       0x6e1d0200, 0xe0524300,
+       0x6e1d0300, 0xb8f82a05,
+       0x80788178, 0x8e788a78,
+       0x8e788178, 0xb8ee1605,
+       0x806e816e, 0x8e6e866e,
+       0x80786e78, 0x80f8c078,
+       0xb8ef1605, 0x806f816f,
+       0x8e6f846f, 0x8e76826f,
+       0xbef600ff, 0x01000000,
+       0xbefc006f, 0xc031003a,
+       0x00000078, 0x80f8c078,
+       0xbf8cc07f, 0x80fc907c,
+       0xbf800000, 0xbe802d00,
+       0xbe822d02, 0xbe842d04,
+       0xbe862d06, 0xbe882d08,
+       0xbe8a2d0a, 0xbe8c2d0c,
+       0xbe8e2d0e, 0xbf06807c,
+       0xbf84fff0, 0xb8f82a05,
+       0x80788178, 0x8e788a78,
+       0x8e788178, 0xb8ee1605,
+       0x806e816e, 0x8e6e866e,
+       0x80786e78, 0xbef60084,
+       0xbef600ff, 0x01000000,
+       0xc0211bfa, 0x00000078,
+       0x80788478, 0xc0211b3a,
        0x00000078, 0x80788478,
-       0xc0211b3a, 0x00000078,
-       0x80788478, 0xc0211b7a,
+       0xc0211b7a, 0x00000078,
+       0x80788478, 0xc0211c3a,
        0x00000078, 0x80788478,
-       0xc0211c3a, 0x00000078,
-       0x80788478, 0xc0211c7a,
+       0xc0211c7a, 0x00000078,
+       0x80788478, 0xc0211eba,
        0x00000078, 0x80788478,
-       0xc0211eba, 0x00000078,
-       0x80788478, 0xc0211efa,
+       0xc0211efa, 0x00000078,
+       0x80788478, 0xc0211a3a,
        0x00000078, 0x80788478,
-       0xc0211a3a, 0x00000078,
-       0x80788478, 0xc0211a7a,
+       0xc0211a7a, 0x00000078,
+       0x80788478, 0xc0211cfa,
        0x00000078, 0x80788478,
-       0xc0211cfa, 0x00000078,
-       0x80788478, 0xbf8cc07f,
-       0xbefc006f, 0xbefe0070,
-       0xbeff0071, 0x866f7bff,
-       0x000003ff, 0xb96f4803,
-       0x866f7bff, 0xfffff800,
-       0x8f6f8b6f, 0xb96fa2c3,
-       0xb973f801, 0xb8ee2a05,
-       0x806e816e, 0x8e6e8a6e,
-       0x8e6e816e, 0xb8ef1605,
-       0x806f816f, 0x8e6f866f,
-       0x806e6f6e, 0x806e746e,
-       0x826f8075, 0x866fff6f,
-       0x0000ffff, 0xc00b1c37,
-       0x00000050, 0xc00b1d37,
-       0x00000060, 0xc0031e77,
-       0x00000074, 0xbf8cc07f,
-       0x866fff6d, 0xf8000000,
-       0x8f6f9b6f, 0x8e6f906f,
-       0xbeee0080, 0x876e6f6e,
-       0x866fff6d, 0x04000000,
-       0x8f6f9a6f, 0x8e6f8f6f,
-       0x876e6f6e, 0x866fff7a,
-       0x00800000, 0x8f6f976f,
-       0xb96ef807, 0x866dff6d,
-       0x0000ffff, 0x86fe7e7e,
-       0x86ea6a6a, 0x8f6e837a,
-       0xb96ee0c2, 0xbf800002,
-       0xb97a0002, 0xbf8a0000,
-       0x95806f6c, 0xbf810000,
+       0xbf8cc07f, 0xbefc006f,
+       0xbefe0070, 0xbeff0071,
+       0x866f7bff, 0x000003ff,
+       0xb96f4803, 0x866f7bff,
+       0xfffff800, 0x8f6f8b6f,
+       0xb96fa2c3, 0xb973f801,
+       0xb8ee2a05, 0x806e816e,
+       0x8e6e8a6e, 0x8e6e816e,
+       0xb8ef1605, 0x806f816f,
+       0x8e6f866f, 0x806e6f6e,
+       0x806e746e, 0x826f8075,
+       0x866fff6f, 0x0000ffff,
+       0xc00b1c37, 0x00000050,
+       0xc00b1d37, 0x00000060,
+       0xc0031e77, 0x00000074,
+       0xbf8cc07f, 0x866fff6d,
+       0xf8000000, 0x8f6f9b6f,
+       0x8e6f906f, 0xbeee0080,
+       0x876e6f6e, 0x866fff6d,
+       0x04000000, 0x8f6f9a6f,
+       0x8e6f8f6f, 0x876e6f6e,
+       0x866fff7a, 0x00800000,
+       0x8f6f976f, 0xb96ef807,
+       0x866dff6d, 0x0000ffff,
+       0x86fe7e7e, 0x86ea6a6a,
+       0x8f6e837a, 0xb96ee0c2,
+       0xbf800002, 0xb97a0002,
+       0xbf8a0000, 0x95806f6c,
+       0xbf810000, 0x00000000,
 };

diff --git a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm
index 4d146bca0b0541789621f02a4cbaeb45001cf5de..cee4cfd5182d59d9c0ce02e0faf2f57e6d9a3572 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm
+++ b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm
@@ -95,6 +95,7 @@ var USE_MTBUF_INSTEAD_OF_MUBUF            =   0                   //because TC EMU currently asserts o
 var SWIZZLE_EN                     =   0                   //whether we use swizzled buffer addressing
 var ACK_SQC_STORE                  =   1                   //workaround for suspected SQC store bug causing incorrect stores under concurrency
 var SAVE_AFTER_XNACK_ERROR         =   1                   //workaround for TCP store failure after XNACK error when ALLOW_REPLAY=0, for debugger
+var SINGLE_STEP_MISSED_WORKAROUND   =  1                   //workaround for lost MODE.DEBUG_EN exception when SAVECTX raised
 
 /**************************************************************************/
 /*                     variables                                         */
@@ -136,6 +137,8 @@ var SQ_WAVE_IB_STS_FIRST_REPLAY_SHIFT       =   15                  //FIXME
 var SQ_WAVE_IB_STS_RCNT_FIRST_REPLAY_MASK      = 0x1F8000
 var SQ_WAVE_IB_STS_RCNT_FIRST_REPLAY_MASK_NEG  = 0x00007FFF    //FIXME
 
+var SQ_WAVE_MODE_DEBUG_EN_MASK         =   0x800
+
 var SQ_BUF_RSRC_WORD1_ATC_SHIFT            =   24
 var SQ_BUF_RSRC_WORD3_MTYPE_SHIFT   =  27
 
@@ -253,6 +256,23 @@ L_SKIP_RESTORE:
 
     s_getreg_b32    s_save_status, hwreg(HW_REG_STATUS)                                    //save STATUS since we will change SCC
     s_andn2_b32            s_save_status, s_save_status, SQ_WAVE_STATUS_SPI_PRIO_MASK      //check whether this is for save
+
+if SINGLE_STEP_MISSED_WORKAROUND
+    // No single step exceptions if MODE.DEBUG_EN=0.
+    s_getreg_b32    ttmp2, hwreg(HW_REG_MODE)
+    s_and_b32       ttmp2, ttmp2, SQ_WAVE_MODE_DEBUG_EN_MASK
+    s_cbranch_scc0  L_NO_SINGLE_STEP_WORKAROUND
+
+    // Second-level trap already handled exception if STATUS.HALT=1.
+    s_and_b32       ttmp2, s_save_status, SQ_WAVE_STATUS_HALT_MASK
+
+    // Prioritize single step exception over context save.
+    // Second-level trap will halt wave and RFE, re-entering for SAVECTX.
+    s_cbranch_scc0  L_FETCH_2ND_TRAP
+
+L_NO_SINGLE_STEP_WORKAROUND:
+end
+
     s_getreg_b32    s_save_trapsts, hwreg(HW_REG_TRAPSTS)
     s_and_b32       ttmp2, s_save_trapsts, SQ_WAVE_TRAPSTS_SAVECTX_MASK    //check whether this is for save
     s_cbranch_scc1  L_SAVE                                     //this is the operation for save