From 77ae76eea9df695b66834b8df2a1060c7dad3eca Mon Sep 17 00:00:00 2001
From: Jack Palevich <jackpal@google.com>
Date: Sun, 10 May 2009 19:59:24 -0700
Subject: [PATCH] converted to C++

Base address of constant table changed, so had to update the "-orig" files.
---
 libacc/{acc.c => acc.cpp}   |  62 ++++++++++++++++++++++--------------
 libacc/test                 |   2 +-
 libacc/tests/hello.out-orig | Bin 40 -> 40 bytes
 libacc/tests/otcc.out-orig  | Bin 8591 -> 8591 bytes
 4 files changed, 39 insertions(+), 25 deletions(-)
 rename libacc/{acc.c => acc.cpp} (96%)

diff --git a/libacc/acc.c b/libacc/acc.cpp
similarity index 96%
rename from libacc/acc.c
rename to libacc/acc.cpp
index 4aa2b3cc2..c2c38c49e 100644
--- a/libacc/acc.c
+++ b/libacc/acc.cpp
@@ -20,11 +20,14 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
+#include <ctype.h>
+#include <dlfcn.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+class compiler {
 /* vars: value of variables 
    loc : local variable index
    glo : global variable index
@@ -64,12 +67,12 @@ FILE* file;
 #define TAG_TOK    ' '
 #define TAG_MACRO  2
 
-pdef(t)
+void pdef(int t)
 {
     *(char *)dstk++ = t;
 }
 
-inp()
+void inp()
 {
     if (dptr) {
         ch = *(char *)dptr++;
@@ -82,13 +85,13 @@ inp()
     /*    printf("ch=%c 0x%x\n", ch, ch); */
 }
 
-isid()
+int isid()
 {
     return isalnum(ch) | ch == '_';
 }
 
 /* read a character constant */
-getq()
+void getq()
 {
     if (ch == '\\') {
         inp();
@@ -97,7 +100,7 @@ getq()
     }
 }
 
-next()
+void next()
 {
     int l, a;
 
@@ -224,11 +227,11 @@ void error(char *fmt,...)
     fprintf(stderr, "%d: ", ftell((FILE *)file));
     vfprintf(stderr, fmt, ap);
     fprintf(stderr, "\n");
-    exit(1);
     va_end(ap);
+    exit(1);
 }
 
-void skip(c)
+void skip(int c)
 {
     if (tok != c) {
         error("'%c' expected", c);
@@ -236,7 +239,7 @@ void skip(c)
     next();
 }
 
-o(n)
+void o(int n)
 {
     /* cannot use unsigned, so we must do a hack */
     while (n && n != -1) {
@@ -246,7 +249,7 @@ o(n)
 }
 
 /* output a symbol and patch all calls to it */
-gsym(t)
+void gsym(int t)
 {
     int n;
     while (t) {
@@ -261,7 +264,7 @@ gsym(t)
 #define psym oad
 
 /* instruction + address */
-oad(n, t)
+int oad(int n, int t)
 {
     o(n);
     *(int *)ind = t;
@@ -271,24 +274,24 @@ oad(n, t)
 }
 
 /* load immediate value */
-li(t)
+int li(int t)
 {
     oad(0xb8, t); /* mov $xx, %eax */
 }
 
-gjmp(t)
+int gjmp(int t)
 {
     return psym(0xe9, t);
 }
 
 /* l = 0: je, l == 1: jne */
-gtst(l, t)
+int gtst(int l, int t)
 {
     o(0x0fc085); /* test %eax, %eax, je/jne xxx */
     return psym(0x84 + l, t);
 }
 
-gcmp(t)
+int gcmp(int t)
 {
     o(0xc139); /* cmp %eax,%ecx */
     li(0);
@@ -297,14 +300,14 @@ gcmp(t)
     o(0xc0);
 }
 
-gmov(l, t)
+int gmov(int l, int t)
 {
     o(l + 0x83);
     oad((t < LOCAL) << 7 | 5, t);
 }
 
 /* l is one if '=' parsing wanted (quick hack) */
-unary(l)
+void unary(int l)
 {
     int n, t, a, c;
 
@@ -375,7 +378,7 @@ unary(l)
             n = *(int *)t;
             /* forward reference: try dlsym */
             if (!n)
-                n = dlsym(0, last_id);
+                n = (int) dlsym(0, (char*) last_id);
             if (tok == '=' & l) {
                 /* assignment */
                 next();
@@ -426,7 +429,7 @@ unary(l)
     }
 }
 
-sum(l)
+void sum(int l)
 {
     int t, n, a;
 
@@ -468,19 +471,20 @@ sum(l)
     }
 }
 
-expr()
+void expr()
 {
     sum(11);
 }
 
 
-test_expr()
+int test_expr()
 {
     expr();
     return gtst(0, 0);
 }
 
-block(l)
+
+void block(int l)
 {
     int a, n, t;
 
@@ -524,7 +528,7 @@ block(l)
             }
         }
         skip(')');
-        block(&a);
+        block((int) &a);
         gjmp(n - ind - 5); /* jmp */
         gsym(a);
     } else if (tok == '{') {
@@ -550,7 +554,7 @@ block(l)
 }
 
 /* 'l' is true if local declarations */
-decl(l)
+void decl(int l)
 {
     int a;
 
@@ -599,7 +603,10 @@ decl(l)
     }
 }
 
-main(int n, char** t)
+public:
+compiler(){}
+
+int compile(int n, char** t)
 {
     file = stdin;
     if (n-- > 1) {
@@ -627,3 +634,10 @@ main(int n, char** t)
     return (*(int (*)())*(int *)(vars + TOK_MAIN)) (n, t);
 #endif
 }
+
+};
+
+int main(int argc, char** argv) {
+    compiler c;
+    return c.compile(argc, argv);
+}
\ No newline at end of file
diff --git a/libacc/test b/libacc/test
index eb4f383be..b4cef93c6 100755
--- a/libacc/test
+++ b/libacc/test
@@ -1,2 +1,2 @@
 #!/bin/sh
-gcc acc.c -DTEST -ldl -o tests/acc && tests/acc tests/otcc.c tests/otcc.out && diff tests/otcc.out tests/otcc.out-orig
+g++ acc.cpp -DTEST -ldl -o tests/acc && tests/acc tests/otcc.c tests/otcc.out && diff tests/otcc.out tests/otcc.out-orig
diff --git a/libacc/tests/hello.out-orig b/libacc/tests/hello.out-orig
index bb178c079d8e2f7d575a9d4d2c3973f94ddbce2f..1fb7bf5cf7b41e1550da4e07b4817180ee6a5471 100644
GIT binary patch
literal 40
mcmWITeA@Vi0SFr3umH&&3<gXLoh>RLkryDM@d!xx<Y55l@(OwY

literal 40
mcmWITeA@Vi0SFr3umH&&3<^vPoh>RLkryDM@d!xx<Y55kf(mK?

diff --git a/libacc/tests/otcc.out-orig b/libacc/tests/otcc.out-orig
index ea32bc8bed91d7f20a8468f22d8f47d68fa136d7..2cb08ff5b4fde47a2be7e0ad254f6e89633e9694 100644
GIT binary patch
delta 1722
zcmaJ>Ply|36wjB;B<pUr+1S)1+ax>rqja&lQ&{b;uDWz(s|C}Pve<xN^-%G!_2R*U
zvJKhD4s)pTdFVkA3o3}%Lk<R&+Qo|XBJD|054A<zzzPKw#p;f~-<ymb5uC%1`QG>5
z`@MhPJGpRj;qa34eQPs<&oym38fgovhT9o}thuH>|0JX_4UNvZ)aoJ8=c#QHRqAZS
zF_ZXnfiEAf9+Tf0pfB#%VA0w%#BLYGtCU1G2(9y!`-&mDK%H*?tKJZ%Zzq+l<BDjj
z>K<qg93<&?!1q56^r|Yu_ANCH{6;NK!b78{VBB<+YewYA=$h&R7+E2?NZR^9v<91J
zqIUpai#|MxD~803BewoIdRIdJ=WIO{D?z6oqvrFmTY;xzQ?t13MI~>t^fMs!2^u|%
zglnp`$sV}oZaVVo<(lv}Y*fn-H776p_7%xU%*Yx&sMC;v>$;I+1oFRZl$NOAXM|h=
zGcgV_o?RCQsaMXi$FsuyuL`)xjqMKdoU!#~<96heG^;tt{XyFJ=(^_xDu%81n^vCW
zy(va_gG4&0Pnf$?xFzG$!ids-XwJgvuVxjPkF(78#~)lFapzCZ^V))(xkm3v`t%Di
zBqTWBAbC|Xxl{Zaay`%M)R}dVQ=e_^iHtR&O8*oX+|KX7pj>{)dOVRdn3hf_?n6ii
z6T5)VC7xoH+h)PmKO~xv%nvo$FuWknpiD~vXGe}M^jM0)NI5umKOHJYVRv=7#xezy
ze)ccV^B;zAS|gKtaoaX)Ks-;GG?@{QL^eM7#q;`S7`Z5fCZT5Q6C)P<zcC_ha5~pS
zjk!7<n874scfTHaQ9<d6Q9g(E=nKm3s%=^IPi_;bIb1xJItDyyWriK;fehDosbvTc
zjy(iCHC6}yI97?lz4nqjbUD2SNxhWS>uI>?Zl(8=XmR_M+n^E}2Ts5{@(4I{j&#69
zOS<*UO)*#;$sPxOmi@vXrlU{|Sxc|<dpU-GF*grP=lTD5p`w@aH*-3Dmonm^=vVUh
zK#lQT%J0KpX8a}Ko8t$7*Txrtdv_iJIy<>!;BHSG;~lJ)4E+vPS?;HxV~$CAzm3jF
zh2n)HV*3E_^+Fc-eqjN4y+EHU`K+ER?kK_}G#D0+{&PiYmaUH$Z{d2wffFEO#h;J`
zkAoNZ_Eo>FdMjPgUluE1`J-5o2f_)|wGxTzCGMr=(iD)2AD0UL&dS*OO6gfhADy^Y
zHjShDTX=b)<?MDicaDi&uHW5W)E6i2hCU|4piEC#(_Dyy()7;ribL44Dx;TU*!bLR
f4pM=noH-p5Nv9YiF1B3?U5ueO<r(;Rq`dEMr;EzF

delta 1722
zcmaJ>O^91n6wXcZl5r-}Ol)eBX_C45sdTV9EsS<XM;$sc)q-hC8QOqgby0CKb>qT?
zG7Xu?Jl>+pb<u?)7E}<ii!2OUY6mOUjZ9aHy3iKe35-xsQLN7M`_9X=PXyoM<K1)5
zIp6ua=hWP(xx)+gkIjt`KF8Xv!=aX-sypog$Qmo^i%$a@lh9~iNG=}|eV$qtQ6<lZ
zY%7632l(pY%5nLf0(#<J6&B5nsMzhKc$t#WI-z-ya!)Zp=d080f7R>4^xe49CZ>qH
zRb>w}`wkNH+vocq2WDB7VEc}m1b(aL$Kj#gRWNSY%CSOnWONO635=|eTqLwP5U#@J
zx$xb<H^Pq%<BB0M<B&E#hwqKc|BN;hks@?z5o*2|*#SHgnV80HH!OLRrI!Y&M^Nu-
z60WG`27BOGyXeTPmt(=-V6;+#s4;%&x35V?Vn$Z)LY;;T+|;63Mj-!-(c%IXyo`{G
zZzjfm#?!0fAo<z__IO&j|5X78xv|}To>SU<AH56tB&<pna&M5<&)sxgUnQ!|eoN;_
z-ko4{w@9Re=A^YNiCZ#0D~u@Z$JR8Q{%Tc#xfsj*Q0$Q<61V?!UAHC3nX7l7rcbXB
z144rHEt1zIlY7K(RIX=vojkh=a_Y0KU6HXSROy`tgVX*U=$Fe2*^I^$QKn^5@dpvo
z!T3(#3-M=I<(8G#=32Y~$?QOb4Z{oK49c|Rakk~?K#!&9kCcsL=d*!A7<N|&t1Od0
z>F57)UGHHCryd&Li`$k}1>$+iq{)ncB((m~FRt4=%g99`FbP#{P7Z1Ke``qEV7G6G
z8gsSVFoQ`*cfJ{VSwZQkVLpe}@JmW})Rv6;C%3WW3@)BX9tR%N=|Nk1Aj9=TauLFV
zBaZ@4kJNzIN6HbnH*R8^DWz5*sTDJ3H3b))&D4Gp&2PPOCsYFCzzKLy9sy_0mJT>*
zNvD>+Edq<9nG?XzGhcecbPTEiYw4BwAj|OAva`Tcj{i^Q%Vr^WJEzlgDI*?;ekpf9
z)EM98+&=uJM_&QHJ$e9mV{{(4cl#lry`4)2?)Jnm-u`My({F#3Wq<NJW?Pi^TIh^a
zD3(7ewhsf}%x8cf=I4Mn^Ypot%b1zMwgOB7gQ0Qso-0z*+MFod!S#j%CqTxEKLHCK
z`!Dd_t6p2pW~ywyDwM(UN1-eagcE40MH1JF+)Ina2_O|eDdxSMmDc7;@p(v(j6EQm
z##X&eyu842cG^e|>j1mlyuY<z*2eCGJ|-hdnHkfQT!{VBbT9HsL!qh5!)p<2d~P-y
esX$Unp9zShQ;ZQ8TP_DKM$ntm6ns2h+V?jH?7%w!