diff --git a/data/languages/xtensa.sinc b/data/languages/xtensa.sinc
index 55d32ab..c86cf62 100644
--- a/data/languages/xtensa.sinc
+++ b/data/languages/xtensa.sinc
@@ -47,6 +47,7 @@ define special_register offset=288 size=4 [ WindowBase WindowStart ];
 define special_register offset=332 size=4 [ PTEVADDR ];
 define special_register offset=356 size=4 [ MMID RASID ITLBCFG DTLBCFG ];
 define special_register offset=384 size=4 [ IBREAKENABLE ];
+define special_register offset=388 size=4 [ MEMCTL ];
 define special_register offset=392 size=4 [ CACHEATTR ATOMCTL ];
 define special_register offset=416 size=4 [ DDR ];
 define special_register offset=424 size=4 [ MEPC MEPS MESAVE MESR MECR MEVADDR ];
@@ -150,7 +151,7 @@ attach variables [ br bs bt ] [
     b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 b10 b11 b12 b13 b14 b15
 ];
 
-#attach variables [ sr ] [ LBEG LEND LCOUNT SAR BR LITBASE _ _ _ _ _ _ SCOMPARE1 _ _ _ ACCLO ACCHI _ _ _ _ _ _ _ _ _ _ _ _ _ _ M0 M1 M2 M3 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ WindowBase WindowStart _ _ _ _ _ _ _ _ _ PTEVADDR _ _ _ _ _  MMID RASID ITLBCFG DTLBCFG _ _ _ IBREAKENABLE _ CACHEATTR ATOMCTL _ _ _ _ DDR _ MEPC MEPS MESAVE MESR MECR MEVADDR _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ IBREAKA0 IBREAKA1 _ _ _ _ _ _ _ _ _ _ _ _ _ _ DBREAKA0 DBREAKA1 _ _ _ _ _ _ _ _ _ _ _ _ _ _ DBREAKC0 DBREAKC1 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ EPC1 EPC2 EPC3 EPC4 EPC5 EPC6 EPC7 _ _ _ _ _ _ _ _ DEPC _ EPS2 EPS3 EPS4 EPS5 EPS6 EPS7 _ _ _ _ _ _ _ _ _ EXCSAVE1 EXCSAVE2 EXCSAVE3 EXCSAVE4 EXCSAVE5 EXCSAVE6 EXCSAVE7 _ _ _ _ _ _ _ _ CPENABLE INTERRUPT INTSET INTCLEAR INTENABLE _ PS VECBASE EXCCAUSE DEBUGCAUSE CCOUNT PRID ICOUNT ICOUNTLEVEL EXCVADDR _ CCOMPARE0 CCOMPARE1 CCOMPARE2 _ MISC0 MISC1 MISC2 MISC3 _ _ _ _ _ _ _ _ ];
+attach variables [  u8_8.15 ] [ LBEG LEND LCOUNT SAR BR LITBASE _ _ _ _ _ _ SCOMPARE1 _ _ _ ACCLO ACCHI _ _ _ _ _ _ _ _ _ _ _ _ _ _ M0 M1 M2 M3 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ WindowBase WindowStart _ _ _ _ _ _ _ _ _ PTEVADDR _ _ _ _ _  MMID RASID ITLBCFG DTLBCFG _ _ _ IBREAKENABLE MEMCTL CACHEATTR ATOMCTL _ _ _ _ DDR _ MEPC MEPS MESAVE MESR MECR MEVADDR _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ IBREAKA0 IBREAKA1 _ _ _ _ _ _ _ _ _ _ _ _ _ _ DBREAKA0 DBREAKA1 _ _ _ _ _ _ _ _ _ _ _ _ _ _ DBREAKC0 DBREAKC1 _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ EPC1 EPC2 EPC3 EPC4 EPC5 EPC6 EPC7 _ _ _ _ _ _ _ _ DEPC _ EPS2 EPS3 EPS4 EPS5 EPS6 EPS7 _ _ _ _ _ _ _ _ _ EXCSAVE1 EXCSAVE2 EXCSAVE3 EXCSAVE4 EXCSAVE5 EXCSAVE6 EXCSAVE7 _ _ _ _ _ _ _ _ CPENABLE INTERRUPT INTSET INTCLEAR INTENABLE _ PS VECBASE EXCCAUSE DEBUGCAUSE CCOUNT PRID ICOUNT ICOUNTLEVEL EXCVADDR _ CCOMPARE0 CCOMPARE1 CCOMPARE2 _ MISC0 MISC1 MISC2 MISC3 _ _ _ _ _ _ _ _ ];
 
 
 # Various 32-bit pointers relative to PC. Any operands that are split across non-consecutive
diff --git a/data/languages/xtensaInstructions.sinc b/data/languages/xtensaInstructions.sinc
index b54eee7..59b9fd8 100644
--- a/data/languages/xtensaInstructions.sinc
+++ b/data/languages/xtensaInstructions.sinc
@@ -1020,7 +1020,9 @@ macro extract_bit(val, bit, result) {
 
 # RSR - Read Special Register, pg. 500.
 :rsr at, u8_8.15 is op0 = 0 & op1 = 0b0011 & u8_8.15 & at & op0 = 0 {
+    local src:4 =  zext(u8_8.15:1);
     at = rsr(u8_8.15:1);
+    at = *[special_register]:4 src;
 }
 
 # RSYNC - Register Read Synchronize, pg. 502.
@@ -1294,6 +1296,8 @@ macro extract_bit(val, bit, result) {
 
 # WSR - Write Special Register, pg. 561.
 :wsr at, u8_8.15 is op2 = 0b0001 & op1 = 0b0011 & u8_8.15 & at & op0 = 0 {
+    local dst:4 =  zext(u8_8.15:1);
+    *[special_register]:4 dst = at;
     wsr(u8_8.15:1, at);
 }
 #:WSR.^sr at is op2=0x1 & op1=0x3 & sr & at & op0=0x0
diff --git a/data/languages/xtensaTodo.sinc b/data/languages/xtensaTodo.sinc
index ecdfb2a..b941c09 100644
--- a/data/languages/xtensaTodo.sinc
+++ b/data/languages/xtensaTodo.sinc
@@ -124,7 +124,9 @@ macro restore() {
 
 
 # L32E - Load 32-bit for Window Exceptions, pg. 376.
-:l32e at, as, s5_12.15_oex is op2 = 0 & op1 = 0b1001 & s5_12.15_oex & as & at & op0 = 0 unimpl
+:l32e at, as, s5_12.15_oex is op2 = 0 & op1 = 0b1001 & s5_12.15_oex & as & at & op0 = 0 {
+    
+}
 
 # MOVSP - Move to Stack Pointer, pg. 427.
 :movsp at, as is op2 = 0 & op1 = 0 & ar = 0b0001 & as & at & op0 = 0 unimpl
@@ -146,7 +148,7 @@ macro restore() {
 
 # ROTW - Rotate Window, pg. 496.
 :rotw s4_4.7 is op2 = 0b0100 & op1 = 0 & ar = 0b1000 & as = 0 & s4_4.7 & op0 = 0 {
-
+    WindowBase = WindowBase + s4_4.7;
 }
 
 # S32E - Store 32-bit for Window Exceptions, pg. 508.