diff --git a/compiler/xtensa/rxtensacon.inc b/compiler/xtensa/rxtensacon.inc
index b73cbc9caf..f146349770 100644
--- a/compiler/xtensa/rxtensacon.inc
+++ b/compiler/xtensa/rxtensacon.inc
@@ -26,7 +26,7 @@ NR_F6 = tregister($02000006);
 NR_F7 = tregister($02000007);
 NR_F8 = tregister($02000008);
 NR_F9 = tregister($02000009);
-NR_F10 = tregister($0200000f);
+NR_F10 = tregister($0200000a);
 NR_F11 = tregister($0200000b);
 NR_F12 = tregister($0200000c);
 NR_F13 = tregister($0200000d);
@@ -42,9 +42,9 @@ NR_B6 = tregister($05000006);
 NR_B7 = tregister($05000007);
 NR_B8 = tregister($05000008);
 NR_B9 = tregister($05000009);
-NR_B10 = tregister($0500000b);
+NR_B10 = tregister($0500000a);
 NR_B11 = tregister($0500000b);
 NR_B12 = tregister($0500000c);
 NR_B13 = tregister($0500000d);
 NR_B14 = tregister($0500000e);
-NR_B15 = tregister($0500000b);
+NR_B15 = tregister($0500000f);
diff --git a/compiler/xtensa/rxtensanum.inc b/compiler/xtensa/rxtensanum.inc
index fc640e5c12..b4f4ce215b 100644
--- a/compiler/xtensa/rxtensanum.inc
+++ b/compiler/xtensa/rxtensanum.inc
@@ -26,7 +26,7 @@ tregister($02000006),
 tregister($02000007),
 tregister($02000008),
 tregister($02000009),
-tregister($0200000f),
+tregister($0200000a),
 tregister($0200000b),
 tregister($0200000c),
 tregister($0200000d),
@@ -42,9 +42,9 @@ tregister($05000006),
 tregister($05000007),
 tregister($05000008),
 tregister($05000009),
-tregister($0500000b),
+tregister($0500000a),
 tregister($0500000b),
 tregister($0500000c),
 tregister($0500000d),
 tregister($0500000e),
-tregister($0500000b)
+tregister($0500000f)
diff --git a/compiler/xtensa/rxtensarni.inc b/compiler/xtensa/rxtensarni.inc
index ecf7a5f1eb..2d451ed15c 100644
--- a/compiler/xtensa/rxtensarni.inc
+++ b/compiler/xtensa/rxtensarni.inc
@@ -26,11 +26,11 @@
 24,
 25,
 26,
+27,
 28,
 29,
 30,
 31,
-27,
 32,
 33,
 34,
@@ -44,7 +44,7 @@
 42,
 43,
 44,
-48,
 45,
 46,
-47
+47,
+48
diff --git a/compiler/xtensa/rxtensasup.inc b/compiler/xtensa/rxtensasup.inc
index 0741a81eda..977891cc95 100644
--- a/compiler/xtensa/rxtensasup.inc
+++ b/compiler/xtensa/rxtensasup.inc
@@ -26,7 +26,7 @@ RS_F6 = $06;
 RS_F7 = $07;
 RS_F8 = $08;
 RS_F9 = $09;
-RS_F10 = $0f;
+RS_F10 = $0a;
 RS_F11 = $0b;
 RS_F12 = $0c;
 RS_F13 = $0d;
@@ -42,9 +42,9 @@ RS_B6 = $06;
 RS_B7 = $07;
 RS_B8 = $08;
 RS_B9 = $09;
-RS_B10 = $0b;
+RS_B10 = $0a;
 RS_B11 = $0b;
 RS_B12 = $0c;
 RS_B13 = $0d;
 RS_B14 = $0e;
-RS_B15 = $0b;
+RS_B15 = $0f;
diff --git a/compiler/xtensa/xtensareg.dat b/compiler/xtensa/xtensareg.dat
index 1f2809ebbe..f92c4d91cc 100644
--- a/compiler/xtensa/xtensareg.dat
+++ b/compiler/xtensa/xtensareg.dat
@@ -34,7 +34,7 @@ F6,$02,$00,$06,f6,6,6
 F7,$02,$00,$07,f7,7,7
 F8,$02,$00,$08,f8,8,8
 F9,$02,$00,$09,f9,9,9
-F10,$02,$00,$0f,f10,10,10
+F10,$02,$00,$0a,f10,10,10
 F11,$02,$00,$0b,f11,11,11
 F12,$02,$00,$0c,f12,12,12
 F13,$02,$00,$0d,f13,13,13
@@ -52,10 +52,10 @@ B6,$05,$00,$06,b6,6,6
 B7,$05,$00,$07,b7,7,7
 B8,$05,$00,$08,b8,8,8
 B9,$05,$00,$09,b9,9,9
-B10,$05,$00,$0b,b10,10,10
+B10,$05,$00,$0a,b10,10,10
 B11,$05,$00,$0b,b11,11,11
 B12,$05,$00,$0c,b12,12,12
 B13,$05,$00,$0d,b13,13,13
 B14,$05,$00,$0e,b14,14,14
-B15,$05,$00,$0b,b15,15,15
+B15,$05,$00,$0f,b15,15,15