From f15a2fce4b13e44cc52c144c0f3a16943c63e9b4 Mon Sep 17 00:00:00 2001
From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Tue, 18 May 2021 12:49:45 +0100
Subject: [PATCH] revert register reordering in ISACaller

---
 src/openpower/decoder/isa/caller.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/openpower/decoder/isa/caller.py b/src/openpower/decoder/isa/caller.py
index 2efb0ea2..28400e64 100644
--- a/src/openpower/decoder/isa/caller.py
+++ b/src/openpower/decoder/isa/caller.py
@@ -52,6 +52,8 @@ special_sprs = {
 
 
 REG_SORT_ORDER = {
+    # TODO (lkcl): adjust other registers that should be in a particular order
+    # probably CA, CA32, and CR
     "FRT": 0,
     "FRA": 0,
     "FRB": 0,
@@ -62,16 +64,15 @@ REG_SORT_ORDER = {
     "RB": 0,
     "RC": 0,
     "RS": 0,
-
-    "LR": 1,
-    "CTR": 1,
-    "TAR": 1,
-    "MSR": 1,
-    "SVSTATE": 1,
-
-    "CR": 4,
-    "CA": 5,
-    "CA32": 6,
+    "CR": 0,
+    "LR": 0,
+    "CTR": 0,
+    "TAR": 0,
+    "MSR": 0,
+    "SVSTATE": 0,
+
+    "CA": 0,
+    "CA32": 0,
 
     "overflow": 7, # should definitely be last
 }
-- 
2.30.2