From dd06be05fb5010dc89e1fab6fcfa2c906f66d815 Mon Sep 17 00:00:00 2001 From: jtvolpe Date: Thu, 19 Apr 2001 03:10:46 +0000 Subject: [PATCH] Cleaned references to machine() Cleaned up MSVC stuff Removed unused local variable (asexpr.c) git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@738 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- as/z80/asexpr.c | 8 ++------ as/z80/aslex.c | 4 ---- as/z80/aslist.c | 7 ------- as/z80/asm.h | 1 - as/z80/asmain.c | 11 ++++------- as/z80/asout.c | 5 ----- as/z80/assubr.c | 5 ----- as/z80/assym.c | 7 ------- as/z80/z80.h | 3 +-- 9 files changed, 7 insertions(+), 44 deletions(-) diff --git a/as/z80/asexpr.c b/as/z80/asexpr.c index 2e2a123e..e6fa421c 100644 --- a/as/z80/asexpr.c +++ b/as/z80/asexpr.c @@ -13,10 +13,6 @@ #include #include -//#if !defined(_MSC_VER) -//#include -//#endif - #include "asm.h" /*)Module asexpr.c @@ -88,7 +84,7 @@ expr(esp, n) register struct expr *esp; int n; { - register int c, d, p; + register int c, p; struct area *ap; struct expr re; @@ -299,7 +295,7 @@ register struct expr *esp; if (c == '-') { expr(esp, 100); abscheck(esp); - esp->e_addr = -esp->e_addr; + esp->e_addr = 0 - esp->e_addr; return; } if (c == '~') { diff --git a/as/z80/aslex.c b/as/z80/aslex.c index 2713ff8d..9eab59a4 100644 --- a/as/z80/aslex.c +++ b/as/z80/aslex.c @@ -17,10 +17,6 @@ #include #include -//#if !defined(_MSC_VER) -//#include -//#endif - #include "asm.h" /*)Module aslex.c diff --git a/as/z80/aslist.c b/as/z80/aslist.c index e3a12b3e..1f57b890 100644 --- a/as/z80/aslist.c +++ b/as/z80/aslist.c @@ -18,13 +18,6 @@ #include #include -//#include "newalloc.h" -//#if defined(_MSC_VER) -//#include -//#else -//#include -//#endif - #include "asm.h" /*)Module aslist.c diff --git a/as/z80/asm.h b/as/z80/asm.h index 734aaa20..7d9ea7a9 100644 --- a/as/z80/asm.h +++ b/as/z80/asm.h @@ -594,6 +594,5 @@ extern struct mne mne[]; /* Machine dependent functions */ -extern VOID machin(); extern VOID minit(); diff --git a/as/z80/asmain.c b/as/z80/asmain.c index 5f6d6a1c..9096bbf7 100644 --- a/as/z80/asmain.c +++ b/as/z80/asmain.c @@ -17,16 +17,13 @@ #include #include -//#if !defined(_MSC_VER) -//#include -//#endif - #ifdef SDK #include #include #undef HUGE #endif #include "asm.h" +#include "z80.h" /*)Module asmain.c * @@ -446,7 +443,7 @@ int i; * char getnb() aslex.c * VOID getst() aslex.c * sym * lookup() assym.c - * VOID machin() ___mch.c + * VOID machine() ___mch.c * mne * mlookup() assym.c * int more() aslex.c * VOID * new() assym.c @@ -759,9 +756,9 @@ loop: { f2 = floor(log(fabs(f1))/log(2))+1; - mantissa = (0x1000000*fabs(f1))/exp(f2*log(2)); + mantissa = (unsigned int) ((0x1000000*fabs(f1))/exp(f2*log(2))) ; mantissa &=0xffffff; - exponent = f2 + 0x40; + exponent = (unsigned int) (f2 + 0x40) ; if (f1<0) exponent |=0x80; } diff --git a/as/z80/asout.c b/as/z80/asout.c index 51b6bb9a..5396de3e 100644 --- a/as/z80/asout.c +++ b/as/z80/asout.c @@ -12,11 +12,6 @@ #include #include #include - -//#if !defined(_MSC_VER) -//#include -//#endif - #include "asm.h" diff --git a/as/z80/assubr.c b/as/z80/assubr.c index 2150cb45..6423d9fd 100644 --- a/as/z80/assubr.c +++ b/as/z80/assubr.c @@ -16,11 +16,6 @@ #include #include #include - -//#if !defined(_MSC_VER) -//#include -//#endif - #include "asm.h" /*)Module assubr.c diff --git a/as/z80/assym.c b/as/z80/assym.c index 3285265f..f57f5f99 100644 --- a/as/z80/assym.c +++ b/as/z80/assym.c @@ -13,13 +13,6 @@ #include #include #include - -//#if defined(_MSC_VER) -//#include -//#else -//#include -//#endif - #include "asm.h" /*)Module assym.c diff --git a/as/z80/z80.h b/as/z80/z80.h index da163f8d..82cf3177 100644 --- a/as/z80/z80.h +++ b/as/z80/z80.h @@ -187,6 +187,5 @@ extern int srch(); extern int comma(); extern int genop(); extern int gixiy(); -extern VOID machin(); extern VOID minit(); - +extern VOID machine(struct mne *mp) ; -- 2.30.2