[AMD Official Use Only - AMD Internal Distribution Only] > -----Original Message----- > From: Cornwall, Jay <Jay.Cornwall@xxxxxxx> > Sent: 09 January 2025 17:56 > To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx > Cc: Cornwall, Jay <Jay.Cornwall@xxxxxxx>; Six, Lancelot > <Lancelot.Six@xxxxxxx> > Subject: [PATCH 2/2] drm/amdkfd: Clear MODE.VSKIP in gfx9 trap handler > > If user shader issues S_SETVSKIP then this state will persist when > executing the trap handler, causing vector instructions to be > skipped. > > Restore VSKIP state before resuming the user shader. Hi, I agree with the patch, I just find the text above confusing. Reading this, I'd expect to see vskip to be resumed before s_rfe in the "non-save" path. However, that patch touches the save path (disable vskip as soon as MODE has been saved) so the rest of the save procedure can work as expected. VSKIP will eventually be restored in the restore path when restoring MODE (no change needed), which is done after any instruction that could have been impacted by VSKIP has already been executed. Anyway, with a slight rework of the wording here, Reviewed-By: Lancelot Six <lancelot.six@xxxxxxx> Best, Lancelot. > > Signed-off-by: Jay Cornwall <jay.cornwall@xxxxxxx> > Cc: Lancelot Six <lancelot.six@xxxxxxx> > --- > .../gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 2721 +++++++++-------- > .../drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 4 +- > 2 files changed, 1366 insertions(+), 1359 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h > b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h > index b8c13549571a..984f0e705078 100644 > --- a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h > +++ b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h > @@ -274,7 +274,7 @@ static const uint32_t cwsr_trap_gfx8_hex[] = { > > > static const uint32_t cwsr_trap_gfx9_hex[] = { > - 0xbf820001, 0xbf820258, > + 0xbf820001, 0xbf820259, > 0xb8f8f802, 0x8978ff78, > 0x00020006, 0xb8fbf803, > 0x866eff78, 0x00002000, > @@ -390,141 +390,98 @@ static const uint32_t cwsr_trap_gfx9_hex[] = { > 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, 0x00000900, > - 0x80048104, 0xd2890001, > - 0x00000900, 0x80048104, > - 0xd2890002, 0x00000900, > - 0x80048104, 0xd2890003, > - 0x00000900, 0x80048104, > - 0xc069003a, 0x00000070, > - 0xbf8cc07f, 0x80709070, > - 0xbf06c004, 0xbf84ffee, > + 0xbefc007e, 0xbf108080, > + 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, > - 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, 0xbef600ff, > - 0x01000000, 0xbefc0084, > - 0xbf0a7b7c, 0xbf84006d, > - 0xbf11017c, 0x807bff7b, > - 0x00001000, 0x867aff78, > + 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, 0xbf850051, > + 0x10000000, 0xbf850030, > + 0x24040682, 0xd86e4000, > + 0x00000002, 0xbf8cc07f, > 0xbe840080, 0xd2890000, > 0x00000900, 0x80048104, > 0xd2890001, 0x00000900, > @@ -544,137 +501,181 @@ static const uint32_t cwsr_trap_gfx9_hex[] = { > 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, > + 0xbef600ff, 0x01000000, > + 0xbefc0084, 0xbf0a7b7c, > + 0xbf84006d, 0xbf11017c, > + 0x807bff7b, 0x00001000, > + 0x867aff78, 0x00400000, > + 0xbf850003, 0xb8faf803, > + 0x897a7aff, 0x10000000, > + 0xbf850051, 0xbe840080, > + 0xd2890000, 0x00000900, > + 0x80048104, 0xd2890001, > + 0x00000900, 0x80048104, > + 0xd2890002, 0x00000900, > + 0x80048104, 0xd2890003, > + 0x00000900, 0x80048104, > + 0xc069003a, 0x00000070, > + 0xbf8cc07f, 0x80709070, > + 0xbf06c004, 0xbf84ffee, > 0xbe840080, 0xd2890000, > - 0x00000902, 0x80048104, > - 0xd2890001, 0x00000902, > + 0x00000901, 0x80048104, > + 0xd2890001, 0x00000901, > 0x80048104, 0xd2890002, > - 0x00000902, 0x80048104, > - 0xd2890003, 0x00000902, > + 0x00000901, 0x80048104, > + 0xd2890003, 0x00000901, > 0x80048104, 0xc069003a, > 0x00000070, 0xbf8cc07f, > 0x80709070, 0xbf06c004, > 0xbf84ffee, 0xbe840080, > - 0xd2890000, 0x00000903, > + 0xd2890000, 0x00000902, > 0x80048104, 0xd2890001, > - 0x00000903, 0x80048104, > - 0xd2890002, 0x00000903, > + 0x00000902, 0x80048104, > + 0xd2890002, 0x00000902, > 0x80048104, 0xd2890003, > - 0x00000903, 0x80048104, > + 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, 0xbf8200c7, > - 0xbef4007e, 0x8675ff7f, > - 0x0000ffff, 0x8775ff75, > - 0x00040000, 0xbef60080, > - 0xbef700ff, 0x00807fac, > - 0x866eff7f, 0x04000000, > - 0xbf84001e, 0xbefe00c1, > - 0xbeff00c1, 0xb8ef4306, > - 0x866fc16f, 0xbf840019, > - 0x8e6f866f, 0x8e6f826f, > - 0xbef6006f, 0xb8f82a05, > - 0x80788178, 0x8e788a78, > - 0xb8ee1605, 0x806e816e, > - 0x8e6e866e, 0x80786e78, > - 0x8078ff78, 0x00000080, > + 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, > + 0xbf8200c7, 0xbef4007e, > + 0x8675ff7f, 0x0000ffff, > + 0x8775ff75, 0x00040000, > + 0xbef60080, 0xbef700ff, > + 0x00807fac, 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, > + 0xbefe00c1, 0xbeff00c1, > 0xbef600ff, 0x01000000, > - 0xbefc0080, 0xe0510000, > - 0x781d0000, 0xe0510100, > - 0x781d0000, 0x807cff7c, > - 0x00000200, 0x8078ff78, > - 0x00000200, 0xbf0a6f7c, > - 0xbf85fff6, 0xbefe00c1, > - 0xbeff00c1, 0xbef600ff, > - 0x01000000, 0xb8ef2a05, > - 0x806f816f, 0x8e6f826f, > - 0x806fff6f, 0x00008000, > - 0xbef80080, 0xbeee0078, > - 0x8078ff78, 0x00000400, > - 0xbefc0084, 0xbf11087c, > - 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, 0xbf8c0f70, > + 0xb8ef2a05, 0x806f816f, > + 0x8e6f826f, 0x806fff6f, > + 0x00008000, 0xbef80080, > + 0xbeee0078, 0x8078ff78, > + 0x00000400, 0xbefc0084, > + 0xbf11087c, 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, > + 0xbf8c0f70, 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, > 0xb8f82a05, 0x80788178, > 0x8e788a78, 0xb8ee1605, > 0x806e816e, 0x8e6e866e, > - 0x80786e78, 0x80f8c078, > - 0xb8ef1605, 0x806f816f, > - 0x8e6f846f, 0x8e76826f, > + 0x80786e78, 0xbef60084, > 0xbef600ff, 0x01000000, > - 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, > + 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, > - 0xb8ef1605, 0x806f816f, > - 0x8e6f866f, 0x806e6f6e, > - 0x806e746e, 0x826f8075, > - 0x866fff6f, 0x0000ffff, > - 0xc00b1c37, 0x00000050, > - 0xc00b1d37, 0x00000060, > - 0xc0031e77, 0x00000074, > - 0xbf8cc07f, 0x8f6e8b77, > - 0x866eff6e, 0x001f8000, > - 0xb96ef807, 0x866dff6d, > - 0x0000ffff, 0x86fe7e7e, > - 0x86ea6a6a, 0x8f6e837a, > - 0xb96ee0c2, 0xbf800002, > - 0xb97a0002, 0xbf8a0000, > - 0xbe801f6c, 0xbf9b0000, > + 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, > + 0x8f6e8b77, 0x866eff6e, > + 0x001f8000, 0xb96ef807, > + 0x866dff6d, 0x0000ffff, > + 0x86fe7e7e, 0x86ea6a6a, > + 0x8f6e837a, 0xb96ee0c2, > + 0xbf800002, 0xb97a0002, > + 0xbf8a0000, 0xbe801f6c, > + 0xbf9b0000, 0x00000000, > }; > > static const uint32_t cwsr_trap_nv1x_hex[] = { > @@ -1302,7 +1303,7 @@ static const uint32_t cwsr_trap_nv1x_hex[] = { > }; > > static const uint32_t cwsr_trap_arcturus_hex[] = { > - 0xbf820001, 0xbf8202d4, > + 0xbf820001, 0xbf8202d5, > 0xb8f8f802, 0x8978ff78, > 0x00020006, 0xb8fbf803, > 0x866eff78, 0x00002000, > @@ -1419,99 +1420,37 @@ static const uint32_t cwsr_trap_arcturus_hex[] = > { > 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, 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, > + 0xbefc007e, 0xbf108080, > + 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, > - 0xbf850030, 0x24040682, > - 0xd86e4000, 0x00000002, > - 0xbf8cc07f, 0xbe840080, > + 0xbf85004d, 0xbe840080, > 0xd2890000, 0x00000900, > 0x80048104, 0xd2890001, > 0x00000900, 0x80048104, > @@ -1530,31 +1469,50 @@ static const uint32_t cwsr_trap_arcturus_hex[] = > { > 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, > + 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, > - 0xb8fb2a05, 0x807b817b, > - 0x8e7b827b, 0xbef600ff, > - 0x01000000, 0xbefc0084, > - 0xbf0a7b7c, 0xbf84006d, > - 0xbf11017c, 0x807bff7b, > - 0x00001000, 0x867aff78, > + 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, 0xbf850051, > + 0x10000000, 0xbf850030, > + 0x24040682, 0xd86e4000, > + 0x00000002, 0xbf8cc07f, > 0xbe840080, 0xd2890000, > 0x00000900, 0x80048104, > 0xd2890001, 0x00000900, > @@ -1574,215 +1532,259 @@ static const uint32_t cwsr_trap_arcturus_hex[] > = { > 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, > + 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, > + 0xbef600ff, 0x01000000, > + 0xbefc0084, 0xbf0a7b7c, > + 0xbf84006d, 0xbf11017c, > + 0x807bff7b, 0x00001000, > + 0x867aff78, 0x00400000, > + 0xbf850003, 0xb8faf803, > + 0x897a7aff, 0x10000000, > + 0xbf850051, 0xbe840080, > + 0xd2890000, 0x00000900, > + 0x80048104, 0xd2890001, > + 0x00000900, 0x80048104, > + 0xd2890002, 0x00000900, > 0x80048104, 0xd2890003, > - 0x00000903, 0x80048104, > + 0x00000900, 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, > 0xbe840080, 0xd2890000, > - 0x00000900, 0x80048104, > - 0xd2890001, 0x00000900, > + 0x00000901, 0x80048104, > + 0xd2890001, 0x00000901, > 0x80048104, 0xd2890002, > - 0x00000900, 0x80048104, > - 0xd2890003, 0x00000900, > + 0x00000901, 0x80048104, > + 0xd2890003, 0x00000901, > 0x80048104, 0xc069003a, > 0x00000070, 0xbf8cc07f, > 0x80709070, 0xbf06c004, > 0xbf84ffee, 0xbe840080, > - 0xd2890000, 0x00000901, > + 0xd2890000, 0x00000902, > 0x80048104, 0xd2890001, > - 0x00000901, 0x80048104, > - 0xd2890002, 0x00000901, > + 0x00000902, 0x80048104, > + 0xd2890002, 0x00000902, > 0x80048104, 0xd2890003, > - 0x00000901, 0x80048104, > + 0x00000902, 0x80048104, > 0xc069003a, 0x00000070, > 0xbf8cc07f, 0x80709070, > 0xbf06c004, 0xbf84ffee, > 0xbe840080, 0xd2890000, > - 0x00000902, 0x80048104, > - 0xd2890001, 0x00000902, > + 0x00000903, 0x80048104, > + 0xd2890001, 0x00000903, > 0x80048104, 0xd2890002, > - 0x00000902, 0x80048104, > - 0xd2890003, 0x00000902, > + 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, 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, 0x00000903, > + 0xd2890000, 0x00000902, > 0x80048104, 0xd2890001, > - 0x00000903, 0x80048104, > - 0xd2890002, 0x00000903, > + 0x00000902, 0x80048104, > + 0xd2890002, 0x00000902, > 0x80048104, 0xd2890003, > - 0x00000903, 0x80048104, > + 0x00000902, 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, 0xbf8200e3, > - 0xbef4007e, 0x8675ff7f, > - 0x0000ffff, 0x8775ff75, > - 0x00040000, 0xbef60080, > - 0xbef700ff, 0x00807fac, > - 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, > + 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, > + 0xbf8200e3, 0xbef4007e, > + 0x8675ff7f, 0x0000ffff, > + 0x8775ff75, 0x00040000, > + 0xbef60080, 0xbef700ff, > + 0x00807fac, 0x866eff7f, > + 0x04000000, 0xbf84001f, > 0xbefe00c1, 0xbeff00c1, > + 0xb8ef4306, 0x866fc16f, > + 0xbf84001a, 0x8e6f866f, > + 0x8e6f826f, 0xbef6006f, > + 0xb8f82a05, 0x80788178, > + 0x8e788a78, 0x8e788178, > + 0xb8ee1605, 0x806e816e, > + 0x8e6e866e, 0x80786e78, > + 0x8078ff78, 0x00000080, > 0xbef600ff, 0x01000000, > - 0xb8ef2a05, 0x806f816f, > - 0x8e6f826f, 0x806fff6f, > - 0x00008000, 0xbef80080, > - 0xbeee0078, 0x8078ff78, > - 0x00000400, 0xbefc0084, > - 0xbf11087c, 0xe0524000, > - 0x781d0000, 0xe0524100, > - 0x781d0100, 0xe0524200, > - 0x781d0200, 0xe0524300, > - 0x781d0300, 0xbf8c0f70, > - 0x7e000300, 0x7e020301, > - 0x7e040302, 0x7e060303, > - 0x807c847c, 0x8078ff78, > - 0x00000400, 0xbf0a6f7c, > - 0xbf85ffee, 0xbefc0080, > - 0xbf11087c, 0xe0524000, > - 0x781d0000, 0xe0524100, > - 0x781d0100, 0xe0524200, > - 0x781d0200, 0xe0524300, > - 0x781d0300, 0xbf8c0f70, > - 0xd3d94000, 0x18000100, > - 0xd3d94001, 0x18000101, > - 0xd3d94002, 0x18000102, > - 0xd3d94003, 0x18000103, > - 0x807c847c, 0x8078ff78, > - 0x00000400, 0xbf0a6f7c, > - 0xbf85ffea, 0xbf9c0000, > - 0xe0524000, 0x6e1d0000, > - 0xe0524100, 0x6e1d0100, > - 0xe0524200, 0x6e1d0200, > - 0xe0524300, 0x6e1d0300, > - 0xbf8c0f70, 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, > + 0xbefc0080, 0xe0510000, > + 0x781d0000, 0xe0510100, > + 0x781d0000, 0x807cff7c, > + 0x00000200, 0x8078ff78, > + 0x00000200, 0xbf0a6f7c, > + 0xbf85fff6, 0xbefe00c1, > + 0xbeff00c1, 0xbef600ff, > + 0x01000000, 0xb8ef2a05, > + 0x806f816f, 0x8e6f826f, > + 0x806fff6f, 0x00008000, > + 0xbef80080, 0xbeee0078, > + 0x8078ff78, 0x00000400, > + 0xbefc0084, 0xbf11087c, > + 0xe0524000, 0x781d0000, > + 0xe0524100, 0x781d0100, > + 0xe0524200, 0x781d0200, > + 0xe0524300, 0x781d0300, > + 0xbf8c0f70, 0x7e000300, > + 0x7e020301, 0x7e040302, > + 0x7e060303, 0x807c847c, > + 0x8078ff78, 0x00000400, > + 0xbf0a6f7c, 0xbf85ffee, > + 0xbefc0080, 0xbf11087c, > + 0xe0524000, 0x781d0000, > + 0xe0524100, 0x781d0100, > + 0xe0524200, 0x781d0200, > + 0xe0524300, 0x781d0300, > + 0xbf8c0f70, 0xd3d94000, > + 0x18000100, 0xd3d94001, > + 0x18000101, 0xd3d94002, > + 0x18000102, 0xd3d94003, > + 0x18000103, 0x807c847c, > + 0x8078ff78, 0x00000400, > + 0xbf0a6f7c, 0xbf85ffea, > + 0xbf9c0000, 0xe0524000, > + 0x6e1d0000, 0xe0524100, > + 0x6e1d0100, 0xe0524200, > + 0x6e1d0200, 0xe0524300, > + 0x6e1d0300, 0xbf8c0f70, > + 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, > - 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, 0x8e6e816e, > - 0xb8ef1605, 0x806f816f, > - 0x8e6f866f, 0x806e6f6e, > - 0x806e746e, 0x826f8075, > - 0x866fff6f, 0x0000ffff, > - 0xc00b1c37, 0x00000050, > - 0xc00b1d37, 0x00000060, > - 0xc0031e77, 0x00000074, > - 0xbf8cc07f, 0x8f6e8b77, > - 0x866eff6e, 0x001f8000, > - 0xb96ef807, 0x866dff6d, > - 0x0000ffff, 0x86fe7e7e, > - 0x86ea6a6a, 0x8f6e837a, > - 0xb96ee0c2, 0xbf800002, > - 0xb97a0002, 0xbf8a0000, > - 0xbe801f6c, 0xbf9b0000, > + 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, > + 0x8f6e8b77, 0x866eff6e, > + 0x001f8000, 0xb96ef807, > + 0x866dff6d, 0x0000ffff, > + 0x86fe7e7e, 0x86ea6a6a, > + 0x8f6e837a, 0xb96ee0c2, > + 0xbf800002, 0xb97a0002, > + 0xbf8a0000, 0xbe801f6c, > + 0xbf9b0000, 0x00000000, > }; > > static const uint32_t cwsr_trap_aldebaran_hex[] = { > - 0xbf820001, 0xbf8202df, > + 0xbf820001, 0xbf8202e0, > 0xb8f8f802, 0x8978ff78, > 0x00020006, 0xb8fbf803, > 0x866eff78, 0x00002000, > @@ -1899,99 +1901,37 @@ static const uint32_t cwsr_trap_aldebaran_hex[] > = { > 0xbefe007c, 0xbefc0070, > 0xc0611c7a, 0x0000007c, > 0xbf8cc07f, 0x80708470, > - 0xbefc007e, 0x867aff7f, > - 0x04000000, 0xbeef0080, > - 0x876f6f7a, 0xb8f02985, > - 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, 0xb8f02985, > - 0x80708170, 0x8e708a70, > - 0x8e708170, 0xb8fa1605, > - 0x807a817a, 0x8e7a867a, > - 0x80707a70, 0x8070ff70, > - 0x00000080, 0xbef600ff, > - 0x01000000, 0xbefc0080, > - 0xd28c0002, 0x000100c1, > - 0xd28d0003, 0x000204c1, > + 0xbefc007e, 0xbf108080, > + 0x867aff7f, 0x04000000, > + 0xbeef0080, 0x876f6f7a, > + 0xb8f02985, 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, > - 0xbf850030, 0x24040682, > - 0xd86e4000, 0x00000002, > - 0xbf8cc07f, 0xbe840080, > + 0xbf85004d, 0xbe840080, > 0xd2890000, 0x00000900, > 0x80048104, 0xd2890001, > 0x00000900, 0x80048104, > @@ -2010,31 +1950,50 @@ static const uint32_t cwsr_trap_aldebaran_hex[] > = { > 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, > + 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, > - 0xb8fb2b05, 0x807b817b, > - 0x8e7b827b, 0xbef600ff, > - 0x01000000, 0xbefc0084, > - 0xbf0a7b7c, 0xbf84006d, > - 0xbf11017c, 0x807bff7b, > - 0x00001000, 0x867aff78, > + 0xb8fb4306, 0x867bc17b, > + 0xbf840064, 0xbf8a0000, > + 0x867aff6f, 0x04000000, > + 0xbf840060, 0x8e7b867b, > + 0x8e7b827b, 0xbef6007b, > + 0xb8f02985, 0x80708170, > + 0x8e708a70, 0x8e708170, > + 0xb8fa1605, 0x807a817a, > + 0x8e7a867a, 0x80707a70, > + 0x8070ff70, 0x00000080, > + 0xbef600ff, 0x01000000, > + 0xbefc0080, 0xd28c0002, > + 0x000100c1, 0xd28d0003, > + 0x000204c1, 0x867aff78, > 0x00400000, 0xbf850003, > 0xb8faf803, 0x897a7aff, > - 0x10000000, 0xbf850051, > + 0x10000000, 0xbf850030, > + 0x24040682, 0xd86e4000, > + 0x00000002, 0xbf8cc07f, > 0xbe840080, 0xd2890000, > 0x00000900, 0x80048104, > 0xd2890001, 0x00000900, > @@ -2054,51 +2013,31 @@ static const uint32_t cwsr_trap_aldebaran_hex[] > = { > 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, > - 0xbf85ffb1, 0xbf9c0000, > - 0xbf820012, 0x7e000300, > - 0x7e020301, 0x7e040302, > - 0x7e060303, 0xe0724000, > - 0x701d0000, 0xe0724100, > - 0x701d0100, 0xe0724200, > - 0x701d0200, 0xe0724300, > - 0x701d0300, 0x807c847c, > - 0x8070ff70, 0x00000400, > - 0xbf0a7b7c, 0xbf85ffef, > - 0xbf9c0000, 0xb8fb2985, > - 0x807b817b, 0x8e7b837b, > - 0xb8fa2b05, 0x807a817a, > - 0x8e7a827a, 0x80fb7a7b, > - 0x867b7b7b, 0xbf84007a, > + 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, 0xb8fb2b05, > + 0x807b817b, 0x8e7b827b, > + 0xbef600ff, 0x01000000, > + 0xbefc0084, 0xbf0a7b7c, > + 0xbf84006d, 0xbf11017c, > 0x807bff7b, 0x00001000, > - 0xbefc0080, 0xbf11017c, > 0x867aff78, 0x00400000, > 0xbf850003, 0xb8faf803, > 0x897a7aff, 0x10000000, > - 0xbf850059, 0xd3d84000, > - 0x18000100, 0xd3d84001, > - 0x18000101, 0xd3d84002, > - 0x18000102, 0xd3d84003, > - 0x18000103, 0xbe840080, > + 0xbf850051, 0xbe840080, > 0xd2890000, 0x00000900, > 0x80048104, 0xd2890001, > 0x00000900, 0x80048104, > @@ -2137,139 +2076,203 @@ static const uint32_t > cwsr_trap_aldebaran_hex[] = { > 0x00000070, 0xbf8cc07f, > 0x80709070, 0xbf06c004, > 0xbf84ffee, 0x807c847c, > - 0xbf0a7b7c, 0xbf85ffa9, > - 0xbf9c0000, 0xbf820016, > - 0xd3d84000, 0x18000100, > - 0xd3d84001, 0x18000101, > - 0xd3d84002, 0x18000102, > - 0xd3d84003, 0x18000103, > + 0xbf0a7b7c, 0xbf85ffb1, > + 0xbf9c0000, 0xbf820012, > + 0x7e000300, 0x7e020301, > + 0x7e040302, 0x7e060303, > 0xe0724000, 0x701d0000, > 0xe0724100, 0x701d0100, > 0xe0724200, 0x701d0200, > 0xe0724300, 0x701d0300, > 0x807c847c, 0x8070ff70, > 0x00000400, 0xbf0a7b7c, > - 0xbf85ffeb, 0xbf9c0000, > - 0xbf8200ee, 0xbef4007e, > - 0x8675ff7f, 0x0000ffff, > - 0x8775ff75, 0x00040000, > - 0xbef60080, 0xbef700ff, > - 0x00807fac, 0x866eff7f, > - 0x04000000, 0xbf84001f, > + 0xbf85ffef, 0xbf9c0000, > + 0xb8fb2985, 0x807b817b, > + 0x8e7b837b, 0xb8fa2b05, > + 0x807a817a, 0x8e7a827a, > + 0x80fb7a7b, 0x867b7b7b, > + 0xbf84007a, 0x807bff7b, > + 0x00001000, 0xbefc0080, > + 0xbf11017c, 0x867aff78, > + 0x00400000, 0xbf850003, > + 0xb8faf803, 0x897a7aff, > + 0x10000000, 0xbf850059, > + 0xd3d84000, 0x18000100, > + 0xd3d84001, 0x18000101, > + 0xd3d84002, 0x18000102, > + 0xd3d84003, 0x18000103, > + 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, 0xbf8200ee, > + 0xbef4007e, 0x8675ff7f, > + 0x0000ffff, 0x8775ff75, > + 0x00040000, 0xbef60080, > + 0xbef700ff, 0x00807fac, > + 0x866eff7f, 0x04000000, > + 0xbf84001f, 0xbefe00c1, > + 0xbeff00c1, 0xb8ef4306, > + 0x866fc16f, 0xbf84001a, > + 0x8e6f866f, 0x8e6f826f, > + 0xbef6006f, 0xb8f82985, > + 0x80788178, 0x8e788a78, > + 0x8e788178, 0xb8ee1605, > + 0x806e816e, 0x8e6e866e, > + 0x80786e78, 0x8078ff78, > + 0x00000080, 0xbef600ff, > + 0x01000000, 0xbefc0080, > + 0xe0510000, 0x781d0000, > + 0xe0510100, 0x781d0000, > + 0x807cff7c, 0x00000200, > + 0x8078ff78, 0x00000200, > + 0xbf0a6f7c, 0xbf85fff6, > 0xbefe00c1, 0xbeff00c1, > - 0xb8ef4306, 0x866fc16f, > - 0xbf84001a, 0x8e6f866f, > - 0x8e6f826f, 0xbef6006f, > - 0xb8f82985, 0x80788178, > - 0x8e788a78, 0x8e788178, > - 0xb8ee1605, 0x806e816e, > - 0x8e6e866e, 0x80786e78, > - 0x8078ff78, 0x00000080, > 0xbef600ff, 0x01000000, > - 0xbefc0080, 0xe0510000, > - 0x781d0000, 0xe0510100, > - 0x781d0000, 0x807cff7c, > - 0x00000200, 0x8078ff78, > - 0x00000200, 0xbf0a6f7c, > - 0xbf85fff6, 0xbefe00c1, > - 0xbeff00c1, 0xbef600ff, > - 0x01000000, 0xb8ef2b05, > - 0x806f816f, 0x8e6f826f, > - 0x806fff6f, 0x00008000, > - 0xbef80080, 0xbeee0078, > - 0x8078ff78, 0x00000400, > - 0xbefc0084, 0xbf11087c, > - 0xe0524000, 0x781d0000, > - 0xe0524100, 0x781d0100, > - 0xe0524200, 0x781d0200, > - 0xe0524300, 0x781d0300, > - 0xbf8c0f70, 0x7e000300, > - 0x7e020301, 0x7e040302, > - 0x7e060303, 0x807c847c, > - 0x8078ff78, 0x00000400, > - 0xbf0a6f7c, 0xbf85ffee, > - 0xb8ef2985, 0x806f816f, > - 0x8e6f836f, 0xb8f92b05, > - 0x80798179, 0x8e798279, > - 0x80ef796f, 0x866f6f6f, > - 0xbf84001a, 0x806fff6f, > - 0x00008000, 0xbefc0080, > + 0xb8ef2b05, 0x806f816f, > + 0x8e6f826f, 0x806fff6f, > + 0x00008000, 0xbef80080, > + 0xbeee0078, 0x8078ff78, > + 0x00000400, 0xbefc0084, > 0xbf11087c, 0xe0524000, > 0x781d0000, 0xe0524100, > 0x781d0100, 0xe0524200, > 0x781d0200, 0xe0524300, > 0x781d0300, 0xbf8c0f70, > - 0xd3d94000, 0x18000100, > - 0xd3d94001, 0x18000101, > - 0xd3d94002, 0x18000102, > - 0xd3d94003, 0x18000103, > + 0x7e000300, 0x7e020301, > + 0x7e040302, 0x7e060303, > 0x807c847c, 0x8078ff78, > 0x00000400, 0xbf0a6f7c, > - 0xbf85ffea, 0xbf9c0000, > - 0xe0524000, 0x6e1d0000, > - 0xe0524100, 0x6e1d0100, > - 0xe0524200, 0x6e1d0200, > - 0xe0524300, 0x6e1d0300, > - 0xbf8c0f70, 0xb8f82985, > - 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, 0xb8f82985, > - 0x80788178, 0x8e788a78, > - 0x8e788178, 0xb8ee1605, > - 0x806e816e, 0x8e6e866e, > - 0x80786e78, 0xbef60084, > - 0xbef600ff, 0x01000000, > - 0xc0211bfa, 0x00000078, > - 0x80788478, 0xc0211b3a, > + 0xbf85ffee, 0xb8ef2985, > + 0x806f816f, 0x8e6f836f, > + 0xb8f92b05, 0x80798179, > + 0x8e798279, 0x80ef796f, > + 0x866f6f6f, 0xbf84001a, > + 0x806fff6f, 0x00008000, > + 0xbefc0080, 0xbf11087c, > + 0xe0524000, 0x781d0000, > + 0xe0524100, 0x781d0100, > + 0xe0524200, 0x781d0200, > + 0xe0524300, 0x781d0300, > + 0xbf8c0f70, 0xd3d94000, > + 0x18000100, 0xd3d94001, > + 0x18000101, 0xd3d94002, > + 0x18000102, 0xd3d94003, > + 0x18000103, 0x807c847c, > + 0x8078ff78, 0x00000400, > + 0xbf0a6f7c, 0xbf85ffea, > + 0xbf9c0000, 0xe0524000, > + 0x6e1d0000, 0xe0524100, > + 0x6e1d0100, 0xe0524200, > + 0x6e1d0200, 0xe0524300, > + 0x6e1d0300, 0xbf8c0f70, > + 0xb8f82985, 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, > + 0xb8f82985, 0x80788178, > + 0x8e788a78, 0x8e788178, > + 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, > - 0xb8ee2985, 0x806e816e, > - 0x8e6e8a6e, 0x8e6e816e, > - 0xb8ef1605, 0x806f816f, > - 0x8e6f866f, 0x806e6f6e, > - 0x806e746e, 0x826f8075, > - 0x866fff6f, 0x0000ffff, > - 0xc00b1c37, 0x00000050, > - 0xc00b1d37, 0x00000060, > - 0xc0031e77, 0x00000074, > - 0xbf8cc07f, 0x8f6e8b77, > - 0x866eff6e, 0x001f8000, > - 0xb96ef807, 0x866dff6d, > - 0x0000ffff, 0x86fe7e7e, > - 0x86ea6a6a, 0x8f6e837a, > - 0xb96ee0c2, 0xbf800002, > - 0xb97a0002, 0xbf8a0000, > - 0xbe801f6c, 0xbf9b0000, > + 0xc0211cfa, 0x00000078, > + 0x80788478, 0xbf8cc07f, > + 0xbefc006f, 0xbefe0070, > + 0xbeff0071, 0x866f7bff, > + 0x000003ff, 0xb96f4803, > + 0x866f7bff, 0xfffff800, > + 0x8f6f8b6f, 0xb96fa2c3, > + 0xb973f801, 0xb8ee2985, > + 0x806e816e, 0x8e6e8a6e, > + 0x8e6e816e, 0xb8ef1605, > + 0x806f816f, 0x8e6f866f, > + 0x806e6f6e, 0x806e746e, > + 0x826f8075, 0x866fff6f, > + 0x0000ffff, 0xc00b1c37, > + 0x00000050, 0xc00b1d37, > + 0x00000060, 0xc0031e77, > + 0x00000074, 0xbf8cc07f, > + 0x8f6e8b77, 0x866eff6e, > + 0x001f8000, 0xb96ef807, > + 0x866dff6d, 0x0000ffff, > + 0x86fe7e7e, 0x86ea6a6a, > + 0x8f6e837a, 0xb96ee0c2, > + 0xbf800002, 0xb97a0002, > + 0xbf8a0000, 0xbe801f6c, > + 0xbf9b0000, 0x00000000, > }; > > static const uint32_t cwsr_trap_gfx10_hex[] = { > @@ -3151,7 +3154,7 @@ static const uint32_t cwsr_trap_gfx11_hex[] = { > }; > > static const uint32_t cwsr_trap_gfx9_4_3_hex[] = { > - 0xbf820001, 0xbf8202db, > + 0xbf820001, 0xbf8202dc, > 0xb8f8f802, 0x8978ff78, > 0x00020006, 0xb8fbf803, > 0x866eff78, 0x00002000, > @@ -3229,73 +3232,136 @@ static const uint32_t cwsr_trap_gfx9_4_3_hex[] > = { > 0x8e708a70, 0x8e708170, > 0xb8fa1605, 0x807a817a, > 0x8e7a867a, 0x80707a70, > - 0xbef60084, 0xbef600ff, > - 0x01000000, 0xbefe007c, > - 0xbefc0070, 0xc0611c7a, > - 0x0000007c, 0xbf8cc07f, > - 0x80708470, 0xbefc007e, > - 0xbefe007c, 0xbefc0070, > - 0xc0611b3a, 0x0000007c, > - 0xbf8cc07f, 0x80708470, > - 0xbefc007e, 0xbefe007c, > - 0xbefc0070, 0xc0611b7a, > - 0x0000007c, 0xbf8cc07f, > - 0x80708470, 0xbefc007e, > - 0xbefe007c, 0xbefc0070, > - 0xc0611bba, 0x0000007c, > - 0xbf8cc07f, 0x80708470, > - 0xbefc007e, 0xbefe007c, > - 0xbefc0070, 0xc0611bfa, > - 0x0000007c, 0xbf8cc07f, > - 0x80708470, 0xbefc007e, > - 0xbefe007c, 0xbefc0070, > - 0xc0611e3a, 0x0000007c, > - 0xbf8cc07f, 0x80708470, > - 0xbefc007e, 0xb8fbf803, > - 0xbefe007c, 0xbefc0070, > - 0xc0611efa, 0x0000007c, > - 0xbf8cc07f, 0x80708470, > - 0xbefc007e, 0xbefe007c, > - 0xbefc0070, 0xc0611a3a, > - 0x0000007c, 0xbf8cc07f, > - 0x80708470, 0xbefc007e, > - 0xbefe007c, 0xbefc0070, > - 0xc0611a7a, 0x0000007c, > - 0xbf8cc07f, 0x80708470, > - 0xbefc007e, 0xb8f1f801, > - 0xbefe007c, 0xbefc0070, > - 0xc0611c7a, 0x0000007c, > - 0xbf8cc07f, 0x80708470, > - 0xbefc007e, 0x867aff7f, > - 0x04000000, 0xbeef0080, > - 0x876f6f7a, 0xb8f02985, > - 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, > + 0xbef60084, 0xbef600ff, > + 0x01000000, 0xbefe007c, > + 0xbefc0070, 0xc0611c7a, > + 0x0000007c, 0xbf8cc07f, > + 0x80708470, 0xbefc007e, > + 0xbefe007c, 0xbefc0070, > + 0xc0611b3a, 0x0000007c, > + 0xbf8cc07f, 0x80708470, > + 0xbefc007e, 0xbefe007c, > + 0xbefc0070, 0xc0611b7a, > + 0x0000007c, 0xbf8cc07f, > + 0x80708470, 0xbefc007e, > + 0xbefe007c, 0xbefc0070, > + 0xc0611bba, 0x0000007c, > + 0xbf8cc07f, 0x80708470, > + 0xbefc007e, 0xbefe007c, > + 0xbefc0070, 0xc0611bfa, > + 0x0000007c, 0xbf8cc07f, > + 0x80708470, 0xbefc007e, > + 0xbefe007c, 0xbefc0070, > + 0xc0611e3a, 0x0000007c, > + 0xbf8cc07f, 0x80708470, > + 0xbefc007e, 0xb8fbf803, > + 0xbefe007c, 0xbefc0070, > + 0xc0611efa, 0x0000007c, > + 0xbf8cc07f, 0x80708470, > + 0xbefc007e, 0xbefe007c, > + 0xbefc0070, 0xc0611a3a, > + 0x0000007c, 0xbf8cc07f, > + 0x80708470, 0xbefc007e, > + 0xbefe007c, 0xbefc0070, > + 0xc0611a7a, 0x0000007c, > + 0xbf8cc07f, 0x80708470, > + 0xbefc007e, 0xb8f1f801, > + 0xbefe007c, 0xbefc0070, > + 0xc0611c7a, 0x0000007c, > + 0xbf8cc07f, 0x80708470, > + 0xbefc007e, 0xbf108080, > + 0x867aff7f, 0x04000000, > + 0xbeef0080, 0x876f6f7a, > + 0xb8f02985, 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, > + 0xb8f02985, 0x80708170, > + 0x8e708a70, 0x8e708170, > + 0xb8fa1605, 0x807a817a, > + 0x8e7a867a, 0x80707a70, > + 0x8070ff70, 0x00000080, > + 0xbef600ff, 0x01000000, > + 0xbefc0080, 0xd28c0002, > + 0x000100c1, 0xd28d0003, > + 0x000204c1, 0x867aff78, > 0x00400000, 0xbf850003, > 0xb8faf803, 0x897a7aff, > - 0x10000000, 0xbf85004d, > + 0x10000000, 0xbf850030, > + 0x24040682, 0xd86e4000, > + 0x00000002, 0xbf8cc07f, > 0xbe840080, 0xd2890000, > 0x00000900, 0x80048104, > 0xd2890001, 0x00000900, > @@ -3315,50 +3381,31 @@ static const uint32_t cwsr_trap_gfx9_4_3_hex[] = > { > 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, 0xb8f02985, > - 0x80708170, 0x8e708a70, > - 0x8e708170, 0xb8fa1605, > - 0x807a817a, 0x8e7a867a, > - 0x80707a70, 0x8070ff70, > - 0x00000080, 0xbef600ff, > - 0x01000000, 0xbefc0080, > - 0xd28c0002, 0x000100c1, > - 0xd28d0003, 0x000204c1, > + 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, 0xb8fb2b05, > + 0x807b817b, 0x8e7b827b, > + 0xbef600ff, 0x01000000, > + 0xbefc0084, 0xbf0a7b7c, > + 0xbf84006d, 0xbf11017c, > + 0x807bff7b, 0x00001000, > 0x867aff78, 0x00400000, > 0xbf850003, 0xb8faf803, > 0x897a7aff, 0x10000000, > - 0xbf850030, 0x24040682, > - 0xd86e4000, 0x00000002, > - 0xbf8cc07f, 0xbe840080, > + 0xbf850051, 0xbe840080, > 0xd2890000, 0x00000900, > 0x80048104, 0xd2890001, > 0x00000900, 0x80048104, > @@ -3377,31 +3424,51 @@ static const uint32_t cwsr_trap_gfx9_4_3_hex[] = > { > 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, > - 0xb8fb2b05, 0x807b817b, > - 0x8e7b827b, 0xbef600ff, > - 0x01000000, 0xbefc0084, > - 0xbf0a7b7c, 0xbf84006d, > - 0xbf11017c, 0x807bff7b, > - 0x00001000, 0x867aff78, > + 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, 0xbf85ffb1, > + 0xbf9c0000, 0xbf820012, > + 0x7e000300, 0x7e020301, > + 0x7e040302, 0x7e060303, > + 0xe0724000, 0x701d0000, > + 0xe0724100, 0x701d0100, > + 0xe0724200, 0x701d0200, > + 0xe0724300, 0x701d0300, > + 0x807c847c, 0x8070ff70, > + 0x00000400, 0xbf0a7b7c, > + 0xbf85ffef, 0xbf9c0000, > + 0xb8fb2985, 0x807b817b, > + 0x8e7b837b, 0xb8fa2b05, > + 0x807a817a, 0x8e7a827a, > + 0x80fb7a7b, 0x867b7b7b, > + 0xbf84007a, 0x807bff7b, > + 0x00001000, 0xbefc0080, > + 0xbf11017c, 0x867aff78, > 0x00400000, 0xbf850003, > 0xb8faf803, 0x897a7aff, > - 0x10000000, 0xbf850051, > + 0x10000000, 0xbf850059, > + 0xd3d84000, 0x18000100, > + 0xd3d84001, 0x18000101, > + 0xd3d84002, 0x18000102, > + 0xd3d84003, 0x18000103, > 0xbe840080, 0xd2890000, > 0x00000900, 0x80048104, > 0xd2890001, 0x00000900, > @@ -3441,202 +3508,139 @@ static const uint32_t > cwsr_trap_gfx9_4_3_hex[] = { > 0xbf8cc07f, 0x80709070, > 0xbf06c004, 0xbf84ffee, > 0x807c847c, 0xbf0a7b7c, > - 0xbf85ffb1, 0xbf9c0000, > - 0xbf820012, 0x7e000300, > - 0x7e020301, 0x7e040302, > - 0x7e060303, 0xe0724000, > + 0xbf85ffa9, 0xbf9c0000, > + 0xbf820016, 0xd3d84000, > + 0x18000100, 0xd3d84001, > + 0x18000101, 0xd3d84002, > + 0x18000102, 0xd3d84003, > + 0x18000103, 0xe0724000, > 0x701d0000, 0xe0724100, > 0x701d0100, 0xe0724200, > 0x701d0200, 0xe0724300, > 0x701d0300, 0x807c847c, > 0x8070ff70, 0x00000400, > - 0xbf0a7b7c, 0xbf85ffef, > - 0xbf9c0000, 0xb8fb2985, > - 0x807b817b, 0x8e7b837b, > - 0xb8fa2b05, 0x807a817a, > - 0x8e7a827a, 0x80fb7a7b, > - 0x867b7b7b, 0xbf84007a, > - 0x807bff7b, 0x00001000, > - 0xbefc0080, 0xbf11017c, > - 0x867aff78, 0x00400000, > - 0xbf850003, 0xb8faf803, > - 0x897a7aff, 0x10000000, > - 0xbf850059, 0xd3d84000, > - 0x18000100, 0xd3d84001, > - 0x18000101, 0xd3d84002, > - 0x18000102, 0xd3d84003, > - 0x18000103, 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, > - 0xbf8200ee, 0xbef4007e, > - 0x8675ff7f, 0x0000ffff, > - 0x8775ff75, 0x00040000, > - 0xbef60080, 0xbef700ff, > - 0x00807fac, 0x866eff7f, > - 0x04000000, 0xbf84001f, > + 0xbf0a7b7c, 0xbf85ffeb, > + 0xbf9c0000, 0xbf8200ee, > + 0xbef4007e, 0x8675ff7f, > + 0x0000ffff, 0x8775ff75, > + 0x00040000, 0xbef60080, > + 0xbef700ff, 0x00807fac, > + 0x866eff7f, 0x04000000, > + 0xbf84001f, 0xbefe00c1, > + 0xbeff00c1, 0xb8ef4306, > + 0x866fc16f, 0xbf84001a, > + 0x8e6f866f, 0x8e6f826f, > + 0xbef6006f, 0xb8f82985, > + 0x80788178, 0x8e788a78, > + 0x8e788178, 0xb8ee1605, > + 0x806e816e, 0x8e6e866e, > + 0x80786e78, 0x8078ff78, > + 0x00000080, 0xbef600ff, > + 0x01000000, 0xbefc0080, > + 0xe0510000, 0x781d0000, > + 0xe0510100, 0x781d0000, > + 0x807cff7c, 0x00000200, > + 0x8078ff78, 0x00000200, > + 0xbf0a6f7c, 0xbf85fff6, > 0xbefe00c1, 0xbeff00c1, > - 0xb8ef4306, 0x866fc16f, > - 0xbf84001a, 0x8e6f866f, > - 0x8e6f826f, 0xbef6006f, > - 0xb8f82985, 0x80788178, > - 0x8e788a78, 0x8e788178, > - 0xb8ee1605, 0x806e816e, > - 0x8e6e866e, 0x80786e78, > - 0x8078ff78, 0x00000080, > 0xbef600ff, 0x01000000, > - 0xbefc0080, 0xe0510000, > - 0x781d0000, 0xe0510100, > - 0x781d0000, 0x807cff7c, > - 0x00000200, 0x8078ff78, > - 0x00000200, 0xbf0a6f7c, > - 0xbf85fff6, 0xbefe00c1, > - 0xbeff00c1, 0xbef600ff, > - 0x01000000, 0xb8ef2b05, > - 0x806f816f, 0x8e6f826f, > - 0x806fff6f, 0x00008000, > - 0xbef80080, 0xbeee0078, > - 0x8078ff78, 0x00000400, > - 0xbefc0084, 0xbf11087c, > - 0xe0524000, 0x781d0000, > - 0xe0524100, 0x781d0100, > - 0xe0524200, 0x781d0200, > - 0xe0524300, 0x781d0300, > - 0xbf8c0f70, 0x7e000300, > - 0x7e020301, 0x7e040302, > - 0x7e060303, 0x807c847c, > - 0x8078ff78, 0x00000400, > - 0xbf0a6f7c, 0xbf85ffee, > - 0xb8ef2985, 0x806f816f, > - 0x8e6f836f, 0xb8f92b05, > - 0x80798179, 0x8e798279, > - 0x80ef796f, 0x866f6f6f, > - 0xbf84001a, 0x806fff6f, > - 0x00008000, 0xbefc0080, > + 0xb8ef2b05, 0x806f816f, > + 0x8e6f826f, 0x806fff6f, > + 0x00008000, 0xbef80080, > + 0xbeee0078, 0x8078ff78, > + 0x00000400, 0xbefc0084, > 0xbf11087c, 0xe0524000, > 0x781d0000, 0xe0524100, > 0x781d0100, 0xe0524200, > 0x781d0200, 0xe0524300, > 0x781d0300, 0xbf8c0f70, > - 0xd3d94000, 0x18000100, > - 0xd3d94001, 0x18000101, > - 0xd3d94002, 0x18000102, > - 0xd3d94003, 0x18000103, > + 0x7e000300, 0x7e020301, > + 0x7e040302, 0x7e060303, > 0x807c847c, 0x8078ff78, > 0x00000400, 0xbf0a6f7c, > - 0xbf85ffea, 0xbf9c0000, > - 0xe0524000, 0x6e1d0000, > - 0xe0524100, 0x6e1d0100, > - 0xe0524200, 0x6e1d0200, > - 0xe0524300, 0x6e1d0300, > - 0xbf8c0f70, 0xb8f82985, > - 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, 0xb8f82985, > - 0x80788178, 0x8e788a78, > - 0x8e788178, 0xb8ee1605, > - 0x806e816e, 0x8e6e866e, > - 0x80786e78, 0xbef60084, > - 0xbef600ff, 0x01000000, > - 0xc0211bfa, 0x00000078, > - 0x80788478, 0xc0211b3a, > + 0xbf85ffee, 0xb8ef2985, > + 0x806f816f, 0x8e6f836f, > + 0xb8f92b05, 0x80798179, > + 0x8e798279, 0x80ef796f, > + 0x866f6f6f, 0xbf84001a, > + 0x806fff6f, 0x00008000, > + 0xbefc0080, 0xbf11087c, > + 0xe0524000, 0x781d0000, > + 0xe0524100, 0x781d0100, > + 0xe0524200, 0x781d0200, > + 0xe0524300, 0x781d0300, > + 0xbf8c0f70, 0xd3d94000, > + 0x18000100, 0xd3d94001, > + 0x18000101, 0xd3d94002, > + 0x18000102, 0xd3d94003, > + 0x18000103, 0x807c847c, > + 0x8078ff78, 0x00000400, > + 0xbf0a6f7c, 0xbf85ffea, > + 0xbf9c0000, 0xe0524000, > + 0x6e1d0000, 0xe0524100, > + 0x6e1d0100, 0xe0524200, > + 0x6e1d0200, 0xe0524300, > + 0x6e1d0300, 0xbf8c0f70, > + 0xb8f82985, 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, > + 0xb8f82985, 0x80788178, > + 0x8e788a78, 0x8e788178, > + 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, > - 0xb8ee2985, 0x806e816e, > - 0x8e6e8a6e, 0x8e6e816e, > - 0xb8ef1605, 0x806f816f, > - 0x8e6f866f, 0x806e6f6e, > - 0x806e746e, 0x826f8075, > - 0x866fff6f, 0x0000ffff, > - 0xc00b1c37, 0x00000050, > - 0xc00b1d37, 0x00000060, > - 0xc0031e77, 0x00000074, > - 0xbf8cc07f, 0x8f6e8b79, > - 0x866eff6e, 0x001f8000, > - 0xb96ef807, 0x866dff6d, > - 0x0000ffff, 0x86fe7e7e, > - 0x86ea6a6a, 0x8f6e837a, > - 0xb96ee0c2, 0xbf800002, > - 0xb97a0002, 0xbf8a0000, > - 0xbe801f6c, 0xbf9b0000, > + 0xc0211cfa, 0x00000078, > + 0x80788478, 0xbf8cc07f, > + 0xbefc006f, 0xbefe0070, > + 0xbeff0071, 0x866f7bff, > + 0x000003ff, 0xb96f4803, > + 0x866f7bff, 0xfffff800, > + 0x8f6f8b6f, 0xb96fa2c3, > + 0xb973f801, 0xb8ee2985, > + 0x806e816e, 0x8e6e8a6e, > + 0x8e6e816e, 0xb8ef1605, > + 0x806f816f, 0x8e6f866f, > + 0x806e6f6e, 0x806e746e, > + 0x826f8075, 0x866fff6f, > + 0x0000ffff, 0xc00b1c37, > + 0x00000050, 0xc00b1d37, > + 0x00000060, 0xc0031e77, > + 0x00000074, 0xbf8cc07f, > + 0x8f6e8b79, 0x866eff6e, > + 0x001f8000, 0xb96ef807, > + 0x866dff6d, 0x0000ffff, > + 0x86fe7e7e, 0x86ea6a6a, > + 0x8f6e837a, 0xb96ee0c2, > + 0xbf800002, 0xb97a0002, > + 0xbf8a0000, 0xbe801f6c, > + 0xbf9b0000, 0x00000000, > }; > > static const uint32_t cwsr_trap_gfx12_hex[] = { > @@ -4124,7 +4128,7 @@ static const uint32_t cwsr_trap_gfx12_hex[] = { > }; > > static const uint32_t cwsr_trap_gfx9_5_0_hex[] = { > - 0xbf820001, 0xbf8202c9, > + 0xbf820001, 0xbf8202ca, > 0xb8f8f802, 0x8978ff78, > 0x00020006, 0xb8fbf803, > 0x866eff78, 0x00002000, > @@ -4239,133 +4243,99 @@ static const uint32_t cwsr_trap_gfx9_5_0_hex[] > = { > 0xbefe007c, 0xbefc0070, > 0xc0611c7a, 0x0000007c, > 0xbf8cc07f, 0x80708470, > - 0xbefc007e, 0x867aff7f, > - 0x04000000, 0xbeef0080, > - 0x876f6f7a, 0xb8f02985, > - 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, > + 0xbefc007e, 0xbf108080, > + 0x867aff7f, 0x04000000, > + 0xbeef0080, 0x876f6f7a, > + 0xb8f02985, 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, > - 0x00000901, 0x80048104, > - 0xd2890002, 0x00000901, > + 0x00000900, 0x80048104, > + 0xd2890002, 0x00000900, > 0x80048104, 0xd2890003, > - 0x00000901, 0x80048104, > + 0x00000900, 0x80048104, > 0xc069003a, 0x00000070, > 0xbf8cc07f, 0x80709070, > 0xbf06c004, 0xbf84ffee, > 0xbe840080, 0xd2890000, > - 0x00000902, 0x80048104, > - 0xd2890001, 0x00000902, > + 0x00000901, 0x80048104, > + 0xd2890001, 0x00000901, > 0x80048104, 0xd2890002, > - 0x00000902, 0x80048104, > - 0xd2890003, 0x00000902, > + 0x00000901, 0x80048104, > + 0xd2890003, 0x00000901, > 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, 0xb8fb5306, > - 0x867bc17b, 0xbf840052, > - 0xbf8a0000, 0x867aff6f, > - 0x04000000, 0xbf84004e, > - 0x8e7b867b, 0x8e7b827b, > - 0xbef6007b, 0xb8f02985, > - 0x80708170, 0x8e708a70, > - 0x8e708170, 0xb8fa1605, > - 0x807a817a, 0x8e7a867a, > - 0x80707a70, 0x8070ff70, > - 0x00000080, 0xbef600ff, > - 0x01000000, 0xbefc0080, > - 0xd28c0002, 0x000100c1, > - 0xd28d0003, 0x000204c1, > - 0x867aff78, 0x00400000, > - 0xbf850003, 0xb8faf803, > - 0x897a7aff, 0x10000000, > - 0xbf85001d, 0x24040682, > - 0xd86c0000, 0x00000002, > - 0xbf8cc07f, 0xbe840080, > - 0xd2890000, 0x00000900, > + 0xd2890000, 0x00000902, > 0x80048104, 0xd2890001, > - 0x00000900, 0x80048104, > - 0xd2890002, 0x00000900, > + 0x00000902, 0x80048104, > + 0xd2890002, 0x00000902, > 0x80048104, 0xd2890003, > - 0x00000900, 0x80048104, > + 0x00000902, 0x80048104, > 0xc069003a, 0x00000070, > 0xbf8cc07f, 0x80709070, > 0xbf06c004, 0xbf84ffee, > - 0x680404ff, 0x00000100, > - 0xd0c9006a, 0x0000f702, > - 0xbf87ffe5, 0xbf820016, > - 0xd1060002, 0x00011103, > - 0x7e0602ff, 0x00000200, > - 0xbefc00ff, 0x00010000, > - 0xbe800077, 0x8677ff77, > - 0xff7fffff, 0x8777ff77, > - 0x00058000, 0xd8ec0000, > - 0x00000002, 0xbf8cc07f, > - 0xe0765000, 0x701d0002, > - 0x68040702, 0xd0c9006a, > - 0x0000f702, 0xbefe016a, > - 0xbf87fff6, 0xbef70000, > - 0xbef000ff, 0x00000400, > + 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, > - 0xb8fb2b05, 0x807b817b, > - 0x8e7b827b, 0xbef600ff, > - 0x01000000, 0xbefc0084, > - 0xbf0a7b7c, 0xbf84006d, > - 0xbf11017c, 0x807bff7b, > - 0x00001000, 0x867aff78, > + 0xb8fb5306, 0x867bc17b, > + 0xbf840052, 0xbf8a0000, > + 0x867aff6f, 0x04000000, > + 0xbf84004e, 0x8e7b867b, > + 0x8e7b827b, 0xbef6007b, > + 0xb8f02985, 0x80708170, > + 0x8e708a70, 0x8e708170, > + 0xb8fa1605, 0x807a817a, > + 0x8e7a867a, 0x80707a70, > + 0x8070ff70, 0x00000080, > + 0xbef600ff, 0x01000000, > + 0xbefc0080, 0xd28c0002, > + 0x000100c1, 0xd28d0003, > + 0x000204c1, 0x867aff78, > 0x00400000, 0xbf850003, > 0xb8faf803, 0x897a7aff, > - 0x10000000, 0xbf850051, > + 0x10000000, 0xbf85001d, > + 0x24040682, 0xd86c0000, > + 0x00000002, 0xbf8cc07f, > 0xbe840080, 0xd2890000, > 0x00000900, 0x80048104, > 0xd2890001, 0x00000900, > @@ -4375,61 +4345,32 @@ static const uint32_t cwsr_trap_gfx9_5_0_hex[] = > { > 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, > - 0xbf85ffb1, 0xbf9c0000, > - 0xbf820012, 0x7e000300, > - 0x7e020301, 0x7e040302, > - 0x7e060303, 0xe0724000, > - 0x701d0000, 0xe0724100, > - 0x701d0100, 0xe0724200, > - 0x701d0200, 0xe0724300, > - 0x701d0300, 0x807c847c, > - 0x8070ff70, 0x00000400, > - 0xbf0a7b7c, 0xbf85ffef, > - 0xbf9c0000, 0xb8fb2985, > - 0x807b817b, 0x8e7b837b, > - 0xb8fa2b05, 0x807a817a, > - 0x8e7a827a, 0x80fb7a7b, > - 0x867b7b7b, 0xbf84007a, > + 0xbf84ffee, 0x680404ff, > + 0x00000100, 0xd0c9006a, > + 0x0000f702, 0xbf87ffe5, > + 0xbf820016, 0xd1060002, > + 0x00011103, 0x7e0602ff, > + 0x00000200, 0xbefc00ff, > + 0x00010000, 0xbe800077, > + 0x8677ff77, 0xff7fffff, > + 0x8777ff77, 0x00058000, > + 0xd8ec0000, 0x00000002, > + 0xbf8cc07f, 0xe0765000, > + 0x701d0002, 0x68040702, > + 0xd0c9006a, 0x0000f702, > + 0xbefe016a, 0xbf87fff6, > + 0xbef70000, 0xbef000ff, > + 0x00000400, 0xbefe00c1, > + 0xbeff00c1, 0xb8fb2b05, > + 0x807b817b, 0x8e7b827b, > + 0xbef600ff, 0x01000000, > + 0xbefc0084, 0xbf0a7b7c, > + 0xbf84006d, 0xbf11017c, > 0x807bff7b, 0x00001000, > - 0xbefc0080, 0xbf11017c, > 0x867aff78, 0x00400000, > 0xbf850003, 0xb8faf803, > 0x897a7aff, 0x10000000, > - 0xbf850059, 0xd3d84000, > - 0x18000100, 0xd3d84001, > - 0x18000101, 0xd3d84002, > - 0x18000102, 0xd3d84003, > - 0x18000103, 0xbe840080, > + 0xbf850051, 0xbe840080, > 0xd2890000, 0x00000900, > 0x80048104, 0xd2890001, > 0x00000900, 0x80048104, > @@ -4468,140 +4409,204 @@ static const uint32_t > cwsr_trap_gfx9_5_0_hex[] = { > 0x00000070, 0xbf8cc07f, > 0x80709070, 0xbf06c004, > 0xbf84ffee, 0x807c847c, > - 0xbf0a7b7c, 0xbf85ffa9, > - 0xbf9c0000, 0xbf820016, > - 0xd3d84000, 0x18000100, > - 0xd3d84001, 0x18000101, > - 0xd3d84002, 0x18000102, > - 0xd3d84003, 0x18000103, > + 0xbf0a7b7c, 0xbf85ffb1, > + 0xbf9c0000, 0xbf820012, > + 0x7e000300, 0x7e020301, > + 0x7e040302, 0x7e060303, > 0xe0724000, 0x701d0000, > 0xe0724100, 0x701d0100, > 0xe0724200, 0x701d0200, > 0xe0724300, 0x701d0300, > 0x807c847c, 0x8070ff70, > 0x00000400, 0xbf0a7b7c, > - 0xbf85ffeb, 0xbf9c0000, > - 0xbf8200f4, 0xbef4007e, > - 0x8675ff7f, 0x0000ffff, > - 0x8775ff75, 0x00040000, > - 0xbef60080, 0xbef700ff, > - 0x00807fac, 0x866eff7f, > - 0x04000000, 0xbf840025, > + 0xbf85ffef, 0xbf9c0000, > + 0xb8fb2985, 0x807b817b, > + 0x8e7b837b, 0xb8fa2b05, > + 0x807a817a, 0x8e7a827a, > + 0x80fb7a7b, 0x867b7b7b, > + 0xbf84007a, 0x807bff7b, > + 0x00001000, 0xbefc0080, > + 0xbf11017c, 0x867aff78, > + 0x00400000, 0xbf850003, > + 0xb8faf803, 0x897a7aff, > + 0x10000000, 0xbf850059, > + 0xd3d84000, 0x18000100, > + 0xd3d84001, 0x18000101, > + 0xd3d84002, 0x18000102, > + 0xd3d84003, 0x18000103, > + 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, 0xbf8200f4, > + 0xbef4007e, 0x8675ff7f, > + 0x0000ffff, 0x8775ff75, > + 0x00040000, 0xbef60080, > + 0xbef700ff, 0x00807fac, > + 0x866eff7f, 0x04000000, > + 0xbf840025, 0xbefe00c1, > + 0xbeff00c1, 0xb8ef5306, > + 0x866fc16f, 0xbf840020, > + 0x8e6f866f, 0x8e6f826f, > + 0xbef6006f, 0xb8f82985, > + 0x80788178, 0x8e788a78, > + 0x8e788178, 0xb8ee1605, > + 0x806e816e, 0x8e6e866e, > + 0x80786e78, 0x8078ff78, > + 0x00000080, 0xbef600ff, > + 0x01000000, 0xbefc0080, > + 0xe0510000, 0x781d0000, > + 0xe0510100, 0x781d0000, > + 0xe0510200, 0x781d0000, > + 0xe0510300, 0x781d0000, > + 0xe0510400, 0x781d0000, > + 0x807cff7c, 0x00000500, > + 0x8078ff78, 0x00000500, > + 0xbf0a6f7c, 0xbf85fff0, > 0xbefe00c1, 0xbeff00c1, > - 0xb8ef5306, 0x866fc16f, > - 0xbf840020, 0x8e6f866f, > - 0x8e6f826f, 0xbef6006f, > - 0xb8f82985, 0x80788178, > - 0x8e788a78, 0x8e788178, > - 0xb8ee1605, 0x806e816e, > - 0x8e6e866e, 0x80786e78, > - 0x8078ff78, 0x00000080, > 0xbef600ff, 0x01000000, > - 0xbefc0080, 0xe0510000, > - 0x781d0000, 0xe0510100, > - 0x781d0000, 0xe0510200, > - 0x781d0000, 0xe0510300, > - 0x781d0000, 0xe0510400, > - 0x781d0000, 0x807cff7c, > - 0x00000500, 0x8078ff78, > - 0x00000500, 0xbf0a6f7c, > - 0xbf85fff0, 0xbefe00c1, > - 0xbeff00c1, 0xbef600ff, > - 0x01000000, 0xb8ef2b05, > - 0x806f816f, 0x8e6f826f, > - 0x806fff6f, 0x00008000, > - 0xbef80080, 0xbeee0078, > - 0x8078ff78, 0x00000400, > - 0xbefc0084, 0xbf11087c, > - 0xe0524000, 0x781d0000, > - 0xe0524100, 0x781d0100, > - 0xe0524200, 0x781d0200, > - 0xe0524300, 0x781d0300, > - 0xbf8c0f70, 0x7e000300, > - 0x7e020301, 0x7e040302, > - 0x7e060303, 0x807c847c, > - 0x8078ff78, 0x00000400, > - 0xbf0a6f7c, 0xbf85ffee, > - 0xb8ef2985, 0x806f816f, > - 0x8e6f836f, 0xb8f92b05, > - 0x80798179, 0x8e798279, > - 0x80ef796f, 0x866f6f6f, > - 0xbf84001a, 0x806fff6f, > - 0x00008000, 0xbefc0080, > + 0xb8ef2b05, 0x806f816f, > + 0x8e6f826f, 0x806fff6f, > + 0x00008000, 0xbef80080, > + 0xbeee0078, 0x8078ff78, > + 0x00000400, 0xbefc0084, > 0xbf11087c, 0xe0524000, > 0x781d0000, 0xe0524100, > 0x781d0100, 0xe0524200, > 0x781d0200, 0xe0524300, > 0x781d0300, 0xbf8c0f70, > - 0xd3d94000, 0x18000100, > - 0xd3d94001, 0x18000101, > - 0xd3d94002, 0x18000102, > - 0xd3d94003, 0x18000103, > + 0x7e000300, 0x7e020301, > + 0x7e040302, 0x7e060303, > 0x807c847c, 0x8078ff78, > 0x00000400, 0xbf0a6f7c, > - 0xbf85ffea, 0xbf9c0000, > - 0xe0524000, 0x6e1d0000, > - 0xe0524100, 0x6e1d0100, > - 0xe0524200, 0x6e1d0200, > - 0xe0524300, 0x6e1d0300, > - 0xbf8c0f70, 0xb8f82985, > - 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, 0xb8f82985, > - 0x80788178, 0x8e788a78, > - 0x8e788178, 0xb8ee1605, > - 0x806e816e, 0x8e6e866e, > - 0x80786e78, 0xbef60084, > - 0xbef600ff, 0x01000000, > - 0xc0211bfa, 0x00000078, > - 0x80788478, 0xc0211b3a, > + 0xbf85ffee, 0xb8ef2985, > + 0x806f816f, 0x8e6f836f, > + 0xb8f92b05, 0x80798179, > + 0x8e798279, 0x80ef796f, > + 0x866f6f6f, 0xbf84001a, > + 0x806fff6f, 0x00008000, > + 0xbefc0080, 0xbf11087c, > + 0xe0524000, 0x781d0000, > + 0xe0524100, 0x781d0100, > + 0xe0524200, 0x781d0200, > + 0xe0524300, 0x781d0300, > + 0xbf8c0f70, 0xd3d94000, > + 0x18000100, 0xd3d94001, > + 0x18000101, 0xd3d94002, > + 0x18000102, 0xd3d94003, > + 0x18000103, 0x807c847c, > + 0x8078ff78, 0x00000400, > + 0xbf0a6f7c, 0xbf85ffea, > + 0xbf9c0000, 0xe0524000, > + 0x6e1d0000, 0xe0524100, > + 0x6e1d0100, 0xe0524200, > + 0x6e1d0200, 0xe0524300, > + 0x6e1d0300, 0xbf8c0f70, > + 0xb8f82985, 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, > + 0xb8f82985, 0x80788178, > + 0x8e788a78, 0x8e788178, > + 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, > - 0xb8ee2985, 0x806e816e, > - 0x8e6e8a6e, 0x8e6e816e, > - 0xb8ef1605, 0x806f816f, > - 0x8e6f866f, 0x806e6f6e, > - 0x806e746e, 0x826f8075, > - 0x866fff6f, 0x0000ffff, > - 0xc00b1c37, 0x00000050, > - 0xc00b1d37, 0x00000060, > - 0xc0031e77, 0x00000074, > - 0xbf8cc07f, 0x8f6e8b79, > - 0x866eff6e, 0x001f8000, > - 0xb96ef807, 0x866dff6d, > - 0x0000ffff, 0x86fe7e7e, > - 0x86ea6a6a, 0x8f6e837a, > - 0xb96ee0c2, 0xbf800002, > - 0xb97a0002, 0xbf8a0000, > - 0xbe801f6c, 0xbf9b0000, > + 0xc0211cfa, 0x00000078, > + 0x80788478, 0xbf8cc07f, > + 0xbefc006f, 0xbefe0070, > + 0xbeff0071, 0x866f7bff, > + 0x000003ff, 0xb96f4803, > + 0x866f7bff, 0xfffff800, > + 0x8f6f8b6f, 0xb96fa2c3, > + 0xb973f801, 0xb8ee2985, > + 0x806e816e, 0x8e6e8a6e, > + 0x8e6e816e, 0xb8ef1605, > + 0x806f816f, 0x8e6f866f, > + 0x806e6f6e, 0x806e746e, > + 0x826f8075, 0x866fff6f, > + 0x0000ffff, 0xc00b1c37, > + 0x00000050, 0xc00b1d37, > + 0x00000060, 0xc0031e77, > + 0x00000074, 0xbf8cc07f, > + 0x8f6e8b79, 0x866eff6e, > + 0x001f8000, 0xb96ef807, > + 0x866dff6d, 0x0000ffff, > + 0x86fe7e7e, 0x86ea6a6a, > + 0x8f6e837a, 0xb96ee0c2, > + 0xbf800002, 0xb97a0002, > + 0xbf8a0000, 0xbe801f6c, > + 0xbf9b0000, 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 0eabb7a8cab9..6869e07a2fff 100644 > --- a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm > +++ b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm > @@ -447,7 +447,9 @@ L_SAVE: > s_getreg_b32 s_save_m0, hwreg(HW_REG_MODE) > //MODE > write_hwreg_to_mem(s_save_m0, s_save_buf_rsrc0, s_save_mem_offset) > > - > + // Clear VSKIP state now that MODE.VSKIP has been saved. > + // If user shader set it then vector instructions would be skipped. > + s_setvskip 0,0 > > /* the first wave in the threadgroup */ > s_and_b32 s_save_tmp, s_save_spi_init_hi, > S_SAVE_SPI_INIT_FIRST_WAVE_MASK // extract fisrt wave bit > -- > 2.34.1