Allow running cpsr command on aarch64

pwndbg/commands/cpsr.py

@@ -5,24 +5,16 @@
 from pwndbg.color import message
 
 
-@pwndbg.commands.ArgparsedCommand("Print out ARM CPSR or xPSR register")
+@pwndbg.commands.ArgparsedCommand("Print out ARM CPSR or xPSR register", aliases=["xpsr"])
 @pwndbg.commands.OnlyWhenRunning
 def cpsr():
     arm_print_psr()
 
-
-@pwndbg.commands.ArgparsedCommand("Print out ARM xPSR or CPSR register")
-@pwndbg.commands.OnlyWhenRunning
-def xpsr():
-    arm_print_psr()
-
-
+# Even though aarch64 doesn't have a CPSR register, GDB calls the PSTATE
+# register CPSR instead
+@pwndbg.commands.OnlyWithArch(["arm", "armcm", "aarch64"])
 def arm_print_psr():
-    if pwndbg.gdblib.arch.current not in ("arm", "armcm"):
-        print(message.warn("This is only available on ARM"))
-        return
-
-    reg = "cpsr" if pwndbg.gdblib.arch.current == "arm" else "xpsr"
+    reg = "xpsr" if pwndbg.gdblib.arch.name == "armcm" else "cpsr"
     print(
         "%s %s"
         % (