diff options
author | skrll <skrll@pkgsrc.org> | 2004-12-03 15:15:23 +0000 |
---|---|---|
committer | skrll <skrll@pkgsrc.org> | 2004-12-03 15:15:23 +0000 |
commit | b7a81af86c3ec7b08f30dbba34aa49c61317ed6d (patch) | |
tree | 3c0c3250090c1e36b994b9f9fde46e5c0a489e03 /emulators/arcem/patches | |
parent | 6e02d7ee4135596fbf3221f6c20ff5e8cf314775 (diff) | |
download | pkgsrc-b7a81af86c3ec7b08f30dbba34aa49c61317ed6d.tar.gz |
Update arcem to 1.00
Changes are
- New manual and new SourceForge page. Other documentation deprecated.
- Added project files for MS VC++, and fix warnings provoked by it.
- Further split of windowing/non-windowing functionality to aid division
of architecture-independent files.
- Windows version made independent from Cygwin.
- Windows support imported from eQRD version. Features brought inline with
other versions, including icon change, and same format for choices file.
- Entirety of build warnings fixed under GCC, including those that appeared
from turning on harsh warning flags.
- General tidying.
- Makefile rearranged so that default Unix builds are more sensible.
- Support for running RISC OS, by Alex Macfarlane Smith and Peter Naulls
- Split of the windowing aspects of the code, to allow independent development.
- Some small speed ups.
- Source code tidying and warning fixes.
Diffstat (limited to 'emulators/arcem/patches')
-rw-r--r-- | emulators/arcem/patches/patch-aa | 61 | ||||
-rw-r--r-- | emulators/arcem/patches/patch-ab | 63 | ||||
-rw-r--r-- | emulators/arcem/patches/patch-ac | 35 | ||||
-rw-r--r-- | emulators/arcem/patches/patch-ad | 35 |
4 files changed, 128 insertions, 66 deletions
diff --git a/emulators/arcem/patches/patch-aa b/emulators/arcem/patches/patch-aa index 683ae4fc28e..a81a7846cd4 100644 --- a/emulators/arcem/patches/patch-aa +++ b/emulators/arcem/patches/patch-aa @@ -1,36 +1,45 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/03/31 21:41:31 cjep Exp $ +$NetBSD: patch-aa,v 1.2 2004/12/03 15:15:23 skrll Exp $ ---- Makefile.orig Tue Aug 3 21:00:16 1999 -+++ Makefile Sun Mar 31 21:34:25 2002 -@@ -22,13 +22,10 @@ - #Default endianness of the emulated processor (LITTLEEND or BIGEND) - ENDIAN=LITTLEEND +--- Makefile.orig 2002-05-05 23:09:39.000000000 +0100 ++++ Makefile +@@ -36,15 +36,14 @@ WARN = -Wall -Wno-return-type -Wno-unkno + + + # add -DHOST_BIGENDIAN for big endian hosts, e.g. Sun, SGI, HP +-CFLAGS = -O3 -D$(ENDIAN) $(CFL) -DNOOS -DNOFPE $(WARN) \ +- -I$(SYSTEM) -Iarch -funroll-loops -fexpensive-optimizations -ffast-math \ +- -fomit-frame-pointer -frerun-cse-after-loop ++#CFLAGS = -O3 -D$(ENDIAN) $(CFL) -DNOOS -DNOFPE $(WARN) \ ++# -I$(SYSTEM) -Iarch -funroll-loops -fexpensive-optimizations -ffast-math \ ++# -fomit-frame-pointer -frerun-cse-after-loop ++CFLAGS = -g -D$(ENDIAN) $(CFL) -DNOOS -DNOFPE $(WARN) -I$(SYSTEM) -Iarch + + -prefix=/usr/local --CC = /home/dg/egcs/bin/gcc --# add -DHOST_BIGENDIAN for big endian hosts, eg. sun, sgi, hp --CFLAGS = -O6 -D$(ENDIAN) $(CFL) -Wall -Wno-return-type -DNOOS -DNOFPE -I/usr/X11/include --#CFLAGS = -g -D$(ENDIAN) $(CFL) -Wall -DNOOS -DNOFPE -I/usr/X11/include -DBENCHMARKEXIT +- -INSTALL_DIR = $(prefix)/bin --INSTALL=cp -+CFLAGS = -O6 -D$(ENDIAN) $(CFL) -Wall -Wno-return-type \ -+ -DNOOS -DNOFPE -I${X11BASE}/include -+ -+INSTALL_DIR = ${PREFIX}/bin ++INSTALL_DIR = $(PREFIX)/bin + INSTALL=cp - # Everything else should be ok as it is. -@@ -56,10 +53,11 @@ - all: armul-arc +@@ -82,8 +81,8 @@ TARGET=!ArcEm/arcem + endif + + ifeq (${SYSTEM},X) +-CFLAGS += -DSYSTEM_X -I/usr/X11R6/include +-LIBS += -L/usr/X11R6/lib -lXext -lX11 ++CFLAGS += -DSYSTEM_X -I${X11BASE}/include ++LIBS += -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXext -lX11 + endif + + ifeq (${SYSTEM},win) +@@ -110,7 +109,7 @@ VER=1.0 + all: $(TARGET) install: all - $(INSTALL) armul $(INSTALL_DIR) -+ $(INSTALL) armul-arc $(INSTALL_DIR) - - armul-arc: $(OBJS) $(MODEL).o -- $(CC) $(CFLAGS) $(OBJS) $(MODEL).o -o $@ -L/usr/X11/lib -lm -lXext -lX11 -+ $(CC) $(CFLAGS) $(OBJS) $(MODEL).o -o $@ -Wl,-R${X11BASE}/lib \ -+ -L${X11BASE}/lib -lm -lXext -lX11 ++ $(INSTALL) arcem $(INSTALL_DIR) - clean: - rm -f *.o arch/*.o armul-arc core *.bb *.bbg *.da + $(TARGET): $(OBJS) $(MODEL).o + $(CC) $(OBJS) $(LIBS) $(MODEL).o -o $@ diff --git a/emulators/arcem/patches/patch-ab b/emulators/arcem/patches/patch-ab index 8e94500b2d1..5bac55b5ee8 100644 --- a/emulators/arcem/patches/patch-ab +++ b/emulators/arcem/patches/patch-ab @@ -1,46 +1,29 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/03/31 21:41:31 cjep Exp $ +$NetBSD: patch-ab,v 1.2 2004/12/03 15:15:23 skrll Exp $ ---- arch/DispKbd.c.orig Tue Aug 3 21:00:17 1999 -+++ arch/DispKbd.c Sun Mar 31 15:34:10 2002 -@@ -43,6 +43,41 @@ +--- X/DispKbd.c.orig 2002-05-05 23:09:39.000000000 +0100 ++++ X/DispKbd.c +@@ -45,7 +45,9 @@ #define HD HOSTDISPLAY #define DC DISPLAYCONTROL -+/* Endian */ -+ -+#ifndef HOST_BIGENDIAN -+ -+#ifdef __Linux__ -+#define __USE_BSD -+#include <endian.h> -+#if BYTE_ORDER == BIG_ENDIAN -+#define HOST_BIGENDIAN -+#endif -+#endif -+ -+#ifdef __NetBSD__ -+#include <sys/endian.h> -+#if BYTE_ORDER == BIG_ENDIAN -+#define HOST_BIGENDIAN -+#endif -+#endif -+ -+#ifdef __APPLE__ -+#include <nameser.h> -+#if BYTE_ORDER == BIG_ENDIAN -+#define HOST_BIGENDIAN -+#endif -+#endif -+ -+#ifdef __sun__ -+#include <sys/byteorder.h> -+#ifdef _BIG_ENDIAN -+#define HOST_BIGENDIAN -+#endif -+#endif -+ -+#endif /* HOST_BIGENDIAN */ -+ ++#if 0 static unsigned AutoKey(ARMul_State *state); - unsigned DisplayKbd_XPoll(ARMul_State *state); ++#endif + static struct EventNode enodes[4]; + //static int autokeyenode=0; /* Flips between 0 and 1 */ +@@ -87,12 +89,14 @@ static unsigned long get_pixelval(unsign + } /* get_pixval */ + + /*----------------------------------------------------------------------------*/ ++#if 0 + static unsigned AutoKey(ARMul_State *state) { + /*fprintf(stderr,"AutoKey!\n"); */ + KBD.TimerIntHasHappened+=2; + + return 0; + }; ++#endif + /*-----------------------------------------------------------------------------*/ + /* I'm not confident that this is completely correct - if it's wrong all hell + is bound to break loose! If it works however it should speed things up diff --git a/emulators/arcem/patches/patch-ac b/emulators/arcem/patches/patch-ac new file mode 100644 index 00000000000..1e4868c096c --- /dev/null +++ b/emulators/arcem/patches/patch-ac @@ -0,0 +1,35 @@ +$NetBSD: patch-ac,v 1.1 2004/12/03 15:15:23 skrll Exp $ + +--- armrdi.c.orig 2004-06-04 09:21:14.000000000 +0100 ++++ armrdi.c +@@ -114,11 +114,13 @@ void ARMul_ConsolePrint(ARMul_State *sta + } + } + ++#if 0 + static void ARMul_DebugPause(ARMul_State *state) + { + if(!(rdi_log & 8)) + state->hostif->dbgpause(state->hostif->dbgarg); + } ++#endif + + /***************************************************************************\ + * RDI_open * +@@ -278,6 +280,7 @@ static int RDI_CPUwrite(unsigned mode, u + * Internal functions for breakpoint table manipulation * + \***************************************************************************/ + ++#if 0 + static void deletewatchnode(WatchNode **prevp) + { WatchNode *p = *prevp; + *prevp = p->next; +@@ -305,7 +308,7 @@ static WatchNode *installwatch(ARMword a + p->bound = bound; + return p; + } +- ++#endif + /***************************************************************************\ + * RDI_execute * + \***************************************************************************/ diff --git a/emulators/arcem/patches/patch-ad b/emulators/arcem/patches/patch-ad new file mode 100644 index 00000000000..79678af0f3a --- /dev/null +++ b/emulators/arcem/patches/patch-ad @@ -0,0 +1,35 @@ +$NetBSD: patch-ad,v 1.1 2004/12/03 15:15:23 skrll Exp $ + +--- arch/armarc.c.orig 2002-05-06 09:52:53.000000000 +0100 ++++ arch/armarc.c +@@ -355,7 +355,7 @@ unsigned ARMul_MemoryInit(ARMul_State *s + FILE *ROMFile; + unsigned int ROMWordNum,ROMWord; + int PresPage; +- unsigned int index; ++ unsigned int idx; + + PrivDPtr = (PrivateDataType *)malloc(sizeof(PrivateDataType)); + if (PrivDPtr == NULL) { +@@ -392,8 +392,8 @@ unsigned ARMul_MemoryInit(ARMul_State *s + exit(3); + }; +
+- for (index = 0; index < (MEMC.RAMSize / 4); index++) +- MEMC.PhysRamfuncs[index]=ARMul_Emulate_DecodeInstr; ++ for (idx = 0; idx < (MEMC.RAMSize / 4); idx++) ++ MEMC.PhysRamfuncs[idx]=ARMul_Emulate_DecodeInstr; + + MEMC.ROMMapFlag=1; /* Map ROM to address 0 */ + MEMC.ControlReg=0; /* Defaults */ +@@ -461,8 +461,8 @@ unsigned ARMul_MemoryInit(ARMul_State *s + PRIVD->irqflags = 0; + PRIVD->fiqflags = 0; + +- for(index = 0;index < (512 * 1024) / UPDATEBLOCKSIZE; index++) { +- MEMC.UpdateFlags[index] = 1; ++ for(idx = 0;idx < (512 * 1024) / UPDATEBLOCKSIZE; idx++) { ++ MEMC.UpdateFlags[idx] = 1; + } + + MEMC.OldAddress1 = -1; |