#define REG_A 0x0001U
#define REG_X 0x0002U
#define REG_Y 0x0004U
-#define REG_SREG_LO 0x0008U
-#define REG_SREG_HI 0x0010U
-#define REG_TMP1 0x0020U
-#define REG_TMP2 0x0040U
-#define REG_TMP3 0x0080U
-#define REG_PTR1_LO 0x0100U
-#define REG_PTR1_HI 0x0200U
-#define REG_PTR2_LO 0x0400U
-#define REG_PTR2_HI 0x0800U
-#define REG_PTR3_LO 0x1000U
-#define REG_PTR3_HI 0x2000U
-#define REG_PTR4_LO 0x4000U
-#define REG_PTR4_HI 0x8000U
+#define REG_TMP1 0x0010U
+#define REG_TMP2 0x0020U
+#define REG_TMP3 0x0040U
+#define REG_TMP4 0x0080U
+#define REG_PTR1 0x0100U
+#define REG_PTR2 0x0200U
+#define REG_PTR3 0x0400U
+#define REG_PTR4 0x0800U
+#define REG_SREG 0x1000U
+#define REG_SP 0x2000U
+#define REG_SAVE 0x4000U
+#define REG_BANK 0x8000U
+
+/* Combined register defines */
#define REG_AX (REG_A | REG_X)
-#define REG_SREG (REG_SREG_LO | REG_SREG_HI)
-#define REG_EAX (REG_AX | REG_SREG)
+#define REG_AY (REG_A | REG_Y)
#define REG_XY (REG_X | REG_Y)
#define REG_AXY (REG_AX | REG_Y)
+#define REG_EAX (REG_AX | REG_SREG)
#define REG_EAXY (REG_EAX | REG_Y)
-#define REG_PTR1 (REG_PTR1_LO | REG_PTR1_HI)
-#define REG_PTR2 (REG_PTR2_LO | REG_PTR2_HI)
-#define REG_PTR3 (REG_PTR3_LO | REG_PTR3_HI)
-#define REG_PTR4 (REG_PTR4_LO | REG_PTR4_HI)
+#define REG_ZP 0xFFF0U
#define REG_ALL 0xFFFFU
+
/*****************************************************************************/
/* Code */
/*****************************************************************************/