From 02092b15f3ecaf151ecb8e7b9635c6b96ec1cc08 Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremy@moleman>
Date: Wed, 24 Jul 2013 20:20:54 -0500
Subject: [PATCH] More integer operations

---
 Makefile       |  7 +++++--
 abCalcOp.c     |  4 ++++
 abCalcOpRcws.c | 37 +++++++++++++++++++++++++++++++++++++
 abCalcOpRcws.h | 14 ++++++++++++++
 abCalcOpStws.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 abCalcOpStws.h | 14 ++++++++++++++
 6 files changed, 123 insertions(+), 2 deletions(-)
 create mode 100644 abCalcOpRcws.c
 create mode 100644 abCalcOpRcws.h
 create mode 100644 abCalcOpStws.c
 create mode 100644 abCalcOpStws.h

diff --git a/Makefile b/Makefile
index e0c0246..a4a10d0 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,8 @@ OBJS=abCalc.o abCalcExpr.o abCalcExpReal.o abCalcExprInt.o abCalcStack.o \
     abCalcMode.o abCalcMain.o abCalcOp.o abCalcError.o abCalcOpAdd.o \
     abCalcOpSubtr.o abCalcOpMult.o abCalcOpDiv.o abCalcOpPower.o \
     abCalcOpAnd.o abCalcOpOr.o abCalcOpXor.o abCalcOpNot.o \
-    abCalcOpBin.o abCalcOpOct.o abCalcOpDec.o abCalcOpHex.o
+    abCalcOpBin.o abCalcOpOct.o abCalcOpDec.o abCalcOpHex.o abCalcOpStws.o \
+    abCalcOpRcws.o
 
 NAME=abCalc
 
@@ -20,7 +21,7 @@ abCalcMain.o: abCalc.h abCalcStack.h abCalcExpr.h abCalcOp.h abCalcError.h
 abCalcOp.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcStack.h abCalcOpAdd.h \
     abCalcOpSubtr.h abCalcOpMult.h abCalcOpDiv.h abCalcOpPower.h \
     abCalcOpAnd.h abCalcOpOr.h abCalcOpXor.h abCalcOpNot.h abCalcOpBin.h \
-    abCalcOpOct.h abCalcOpDec.h abCalcOpHex.h
+    abCalcOpOct.h abCalcOpDec.h abCalcOpHex.h abCalcOpStws.h abCalcOpRcws.h
 abCalcOpAdd.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcStack.h abCalcOpAdd.h
 abCalcOpSubtr.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcStack.h abCalcOpSubtr.h
 abCalcOpMult.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcStack.h abCalcOpMult.h
@@ -34,6 +35,8 @@ abCalcOpBin.o: abCalcOp.h abCalcMode.h abCalcOpBin.h
 abCalcOpOct.o: abCalcOp.h abCalcMode.h abCalcOpOct.h
 abCalcOpDec.o: abCalcOp.h abCalcMode.h abCalcOpDec.h
 abCalcOpHex.o: abCalcOp.h abCalcMode.h abCalcOpHex.h
+abCalcOpStws.o: abCalcOp.h abCalcMode.h abCalcStack.h abCalcExpr.h abCalcError.h abCalcOpStws.h
+abCalcOpRcws.o: abCalcOp.h abCalcMode.h abCalcStack.h abCalcExpr.h abCalcOpRcws.h
 
 
 $(NAME): $(OBJS)
diff --git a/abCalcOp.c b/abCalcOp.c
index 34cbc6f..5b4b684 100644
--- a/abCalcOp.c
+++ b/abCalcOp.c
@@ -27,6 +27,8 @@
 #include "abCalcOpOct.h"
 #include "abCalcOpDec.h"
 #include "abCalcOpHex.h"
+#include "abCalcOpStws.h"
+#include "abCalcOpRcws.h"
 
 
 #define AB_CALC_MAX_OPS 128
@@ -55,6 +57,8 @@ void abCalcOpInit(void)
     abCalcOpOctInit();
     abCalcOpDecInit();
     abCalcOpHexInit();
+    abCalcOpStwsInit();
+    abCalcOpRcwsInit();
 }
 
 
diff --git a/abCalcOpRcws.c b/abCalcOpRcws.c
new file mode 100644
index 0000000..5404370
--- /dev/null
+++ b/abCalcOpRcws.c
@@ -0,0 +1,37 @@
+/* 
+    abCalcOpRcws.c
+        By: Jeremy Rand
+ */
+
+
+#include <stdio.h>
+
+#include "abCalcOpRcws.h"
+
+#include "abCalcOp.h"
+#include "abCalcExpr.h"
+#include "abCalcStack.h"
+#include "abCalcMode.h"
+
+
+#define OP_NAME "RCWS"
+
+
+static void rcwsExecute(void);
+
+
+void abCalcOpRcwsInit(void)
+{
+    abCalcOpRegister(OP_NAME, rcwsExecute);
+}
+
+
+void rcwsExecute(void)
+{
+    abCalcExpr result;
+
+    result.type = abCalcExprTypeReal;
+    result.u.real = abCalcModeGetIntWidth();
+
+    abCalcStackExprPush(&result);
+}
diff --git a/abCalcOpRcws.h b/abCalcOpRcws.h
new file mode 100644
index 0000000..7556c01
--- /dev/null
+++ b/abCalcOpRcws.h
@@ -0,0 +1,14 @@
+/* 
+    abCalcOpRcws.h
+        By: Jeremy Rand
+ */
+
+
+#ifndef ABCALCOPRCWS_H
+#define ABCALCOPRCWS_H
+
+
+void abCalcOpRcwsInit(void);
+
+
+#endif
diff --git a/abCalcOpStws.c b/abCalcOpStws.c
new file mode 100644
index 0000000..0bc364d
--- /dev/null
+++ b/abCalcOpStws.c
@@ -0,0 +1,49 @@
+/* 
+    abCalcOpStws.c
+        By: Jeremy Rand
+ */
+
+
+#include <stdio.h>
+
+#include "abCalcOpStws.h"
+
+#include "abCalcOp.h"
+#include "abCalcExpr.h"
+#include "abCalcError.h"
+#include "abCalcStack.h"
+#include "abCalcMode.h"
+
+
+#define OP_NAME "STWS"
+
+
+static void stwsExecute(void);
+
+
+void abCalcOpStwsInit(void)
+{
+    abCalcOpRegister(OP_NAME, stwsExecute);
+}
+
+
+void stwsExecute(void)
+{
+    int newWidth;
+    AB_CALC_OP_ONE_ARG(OP_NAME);
+
+    if (expr->type != abCalcExprTypeReal) {
+        abCalcRaiseError(abCalcBadArgTypeError, OP_NAME);
+        return;
+    }
+
+    newWidth = (int)expr->u.real;
+    if ((newWidth < 1) ||
+        (newWidth > AB_CALC_EXPR_MAX_INT_WIDTH)) {
+        abCalcRaiseError(abCalcBadArgValueError, OP_NAME);
+        return;
+    }
+
+    abCalcModeSetIntWidth(newWidth);
+    abCalcStackExprPop(NULL);
+}
diff --git a/abCalcOpStws.h b/abCalcOpStws.h
new file mode 100644
index 0000000..ff786eb
--- /dev/null
+++ b/abCalcOpStws.h
@@ -0,0 +1,14 @@
+/* 
+    abCalcOpStws.h
+        By: Jeremy Rand
+ */
+
+
+#ifndef ABCALCOPSTWS_H
+#define ABCALCOPSTWS_H
+
+
+void abCalcOpStwsInit(void);
+
+
+#endif