From d98df4f8d38eb8528d96afbf3939be4fa73828aa Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Fri, 30 Dec 2022 12:19:49 -0800 Subject: [PATCH] Remove extra MState macro and replace MState(&MachineState)->x with a direct MachineState.x field access. --- inc/lispemul.h | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/inc/lispemul.h b/inc/lispemul.h index 51624ad..8ce3112 100644 --- a/inc/lispemul.h +++ b/inc/lispemul.h @@ -318,19 +318,18 @@ typedef struct lbits { extern struct state MachineState; -#define MState (&MachineState) #define CURRENTFX ((struct frameex1 *)(((DLword *)PVar) - FRAMESIZE)) -#define IVar (MState->ivar) -#define PVar (MState->pvar) -#define CurrentStackPTR (MState->csp) -#define TopOfStack (MState->tosvalue) -#define PC (MState->currentpc) -#define FuncObj (MState->currentfunc) -#define EndSTKP (MState->endofstack) -#define Irq_Stk_Check (MState->irqcheck) -#define Irq_Stk_End (MState->irqend) -#define Scratch_CSTK (MState->scratch_cstk) -#define Error_Exit (MState->errorexit) +#define IVar (MachineState.ivar) +#define PVar (MachineState.pvar) +#define CurrentStackPTR (MachineState.csp) +#define TopOfStack (MachineState.tosvalue) +#define PC (MachineState.currentpc) +#define FuncObj (MachineState.currentfunc) +#define EndSTKP (MachineState.endofstack) +#define Irq_Stk_Check (MachineState.irqcheck) +#define Irq_Stk_End (MachineState.irqend) +#define Scratch_CSTK (MachineState.scratch_cstk) +#define Error_Exit (MachineState.errorexit) /**************************************************** MakeAddr: