pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code cleanup (#393)

Browse source 
* Code cleanup using deheader for removing unnused headers and adding others to be portable. Removed unused files and renamed .cpp files that are only used as #includes in others

* add missing files
This commit is contained in:
Christer Solskogen 2018-12-23 15:34:53 +01:00 • committed by Dimitris Panokostas
parent ac1c64d52f
commit a3dd9af895
140 changed files with 442 additions and 10639 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -19,7 +19,7 @@ endif
# DispmanX Common flags for both SDL1 and SDL2 (RPI-specific)
#
DISPMANX_FLAGS = -DUSE_DISPMANX -I/opt/vc/include -I/opt/vc/include/interface/vmcs_host/linux -I/opt/vc/include/interface/vcos/pthreads
DISPMANX_LDFLAGS = -lbcm_host -lvchiq_arm -L/opt/vc/lib
DISPMANX_LDFLAGS = -lbcm_host -lvchiq_arm -L/opt/vc/lib -Wl,-rpath=/opt/vc/lib
CPPFLAGS=-MD -MT $@ -MF $(@:%.o=%.d)
#DEBUG=1
@ -171,7 +171,7 @@ endif
RM = rm -f
CC ?= gcc
CXX ?= g++
STRIP = strip
STRIP ?= strip
PROG = $(NAME)
#

5
src/akiko.cpp
View file

@ -10,8 +10,10 @@
* Copyright 2001-2016 Toni Wilen
*
*/
#include <stdbool.h>
#include <string.h>
#include <stdlib.h>
#include "sysconfig.h"
#include "sysdeps.h"
#include "options.h"
@ -21,7 +23,6 @@
#include "blkdev.h"
#include "zfile.h"
#include "threaddep/thread.h"
#include "akiko.h"
#include "gui.h"
#include "crc32.h"
#include "uae.h"

6
src/ar.cpp
View file

@ -201,7 +201,10 @@
*
*/
#include "sysconfig.h"
#include <stdbool.h>
#include <string.h>
#include <stdlib.h>
#include "sysdeps.h"
#include "options.h"
@ -214,7 +217,6 @@
#include "ar.h"
#include "savestate.h"
#include "crc32.h"
#include "akiko.h"
static const TCHAR *cart_memnames[] = { NULL, _T("hrtmon"), _T("arhrtmon"), _T("superiv") };

10
src/audio.cpp
View file

@ -12,22 +12,20 @@
*
*/
#include "sysconfig.h"
#include <stdbool.h>
#include <string.h>
#include "sysdeps.h"
#include "options.h"
#include "memory.h"
#include "custom.h"
#include "newcpu.h"
#include "autoconf.h"
#include "gensound.h"
#include "audio.h"
#include "sounddep/sound.h"
#include "savestate.h"
#include "gui.h"
#include <math.h>
#define PERIOD_MIN 4
#define PERIOD_MIN_NONCE 60
@ -48,7 +46,7 @@ STATIC_INLINE bool usehacks (void)
* sufficient for all imaginable purposes. This must be power of two. */
#define SINC_QUEUE_LENGTH 256
#include "sinctable.cpp"
#include "sinctable.cpp.in"
typedef struct {
int time, output;

5
src/autoconf.cpp
View file

@ -7,16 +7,13 @@
* Copyright 1996 Ed Hanway
*/
#include "sysconfig.h"
#include <string.h>
#include "sysdeps.h"
#include "options.h"
#include "uae.h"
#include "memory.h"
#include "custom.h"
#include "newcpu.h"
#include "autoconf.h"
#include "traps.h"
#include "inputdevice.h"
/* Commonly used autoconfig strings */

8
src/blitfunc.cpp
View file

@ -1,12 +1,8 @@
#include "sysconfig.h"
#include "sysdeps.h"
#include "options.h"
#include "include/memory.h"
#include "newcpu.h"
#include "custom.h"
#include "savestate.h"
#include "options.h"
#include "blitter.h"
#include "blitfunc.h"
#include "memory.h"
void blitdofast_0(uaecptr pta, uaecptr ptb, uaecptr ptc, uaecptr ptd, struct bltinfo *b)
{

262
src/blitops.cpp
View file

@ -1,262 +0,0 @@
/* This file generated automatically - do not edit */
#include "genblitter.h"
struct blitop blitops[256] = {
/* 00 */{ "0", 0 },
/* 01 */{ "~(srca | srcb | srcc)", 7 },
/* 02 */{ "(srcc & ~(srca | srcb))", 7 },
/* 03 */{ "~(srca | srcb)", 3 },
/* 04 */{ "(srcb & ~(srca | srcc))", 7 },
/* 05 */{ "~(srca | srcc)", 5 },
/* 06 */{ "(~srca & (srcb ^ srcc))", 7 },
/* 07 */{ "~(srca | (srcb & srcc))", 7 },
/* 08 */{ "(~srca & srcb & srcc)", 7 },
/* 09 */{ "~(srca | (srcb ^ srcc))", 7 },
/* 0a */{ "(~srca & srcc)", 5 },
/* 0b */{ "~(srca | (srcb & ~srcc))", 7 },
/* 0c */{ "(~srca & srcb)", 3 },
/* 0d */{ "~(srca | (~srcb & srcc))", 7 },
/* 0e */{ "(~srca & (srcb | srcc))", 7 },
/* 0f */{ "~srca", 1 },
/* 10 */{ "(srca & ~(srcb | srcc))", 7 },
/* 11 */{ "~(srcb | srcc)", 6 },
/* 12 */{ "(~srcb & (srca ^ srcc))", 7 },
/* 13 */{ "~(srcb | (srca & srcc))", 7 },
/* 14 */{ "(~srcc & (srca ^ srcb))", 7 },
/* 15 */{ "~(srcc | (srca & srcb))", 7 },
/* 16 */{ "(srca ^ ((srca & srcb) | (srcb ^ srcc)))", 7 },
/* 17 */{ "~(srca ^ ((srca ^ srcb) & (srca ^ srcc)))", 7 },
/* 18 */{ "((srca ^ srcb) & (srca ^ srcc))", 7 },
/* 19 */{ "(srcb ^ (~srcc | (srca & srcb)))", 7 },
/* 1a */{ "(srca ^ (srcc | (srca & srcb)))", 7 },
/* 1b */{ "(srca ^ (srcc | ~(srca ^ srcb)))", 7 },
/* 1c */{ "(srca ^ (srcb | (srca & srcc)))", 7 },
/* 1d */{ "(srca ^ (srcb | ~(srca ^ srcc)))", 7 },
/* 1e */{ "(srca ^ (srcb | srcc))", 7 },
/* 1f */{ "~(srca & (srcb | srcc))", 7 },
/* 20 */{ "(srca & ~srcb & srcc)", 7 },
/* 21 */{ "~(srcb | (srca ^ srcc))", 7 },
/* 22 */{ "(~srcb & srcc)", 6 },
/* 23 */{ "~(srcb | (srca & ~srcc))", 7 },
/* 24 */{ "((srca ^ srcb) & (srcb ^ srcc))", 7 },
/* 25 */{ "(srca ^ (~srcc | (srca & srcb)))", 7 },
/* 26 */{ "(srcb ^ (srcc | (srca & srcb)))", 7 },
/* 27 */{ "~(srca ^ (srcc & (srca ^ srcb)))", 7 },
/* 28 */{ "(srcc & (srca ^ srcb))", 7 },
/* 29 */{ "~(srca ^ srcb ^ (srcc | (srca & srcb)))", 7 },
/* 2a */{ "(srcc & ~(srca & srcb))", 7 },
/* 2b */{ "~(srca ^ ((srca ^ srcb) & (srcb ^ srcc)))", 7 },
/* 2c */{ "(srcb ^ (srca & (srcb | srcc)))", 7 },
/* 2d */{ "(srca ^ (srcb | ~srcc))", 7 },
/* 2e */{ "(srca ^ (srcb | (srca ^ srcc)))", 7 },
/* 2f */{ "~(srca & (srcb | ~srcc))", 7 },
/* 30 */{ "(srca & ~srcb)", 3 },
/* 31 */{ "~(srcb | (~srca & srcc))", 7 },
/* 32 */{ "(~srcb & (srca | srcc))", 7 },
/* 33 */{ "~srcb", 2 },
/* 34 */{ "(srcb ^ (srca | (srcb & srcc)))", 7 },
/* 35 */{ "(srcb ^ (srca | ~(srcb ^ srcc)))", 7 },
/* 36 */{ "(srcb ^ (srca | srcc))", 7 },
/* 37 */{ "~(srcb & (srca | srcc))", 7 },
/* 38 */{ "(srca ^ (srcb & (srca | srcc)))", 7 },
/* 39 */{ "(srcb ^ (srca | ~srcc))", 7 },
/* 3a */{ "(srcb ^ (srca | (srcb ^ srcc)))", 7 },
/* 3b */{ "~(srcb & (srca | ~srcc))", 7 },
/* 3c */{ "(srca ^ srcb)", 3 },
/* 3d */{ "(srca ^ (srcb | ~(srca | srcc)))", 7 },
/* 3e */{ "(srca ^ (srcb | (srca ^ (srca | srcc))))", 7 },
/* 3f */{ "~(srca & srcb)", 3 },
/* 40 */{ "(srca & srcb & ~srcc)", 7 },
/* 41 */{ "~(srcc | (srca ^ srcb))", 7 },
/* 42 */{ "((srca ^ srcc) & (srcb ^ srcc))", 7 },
/* 43 */{ "(srca ^ (~srcb | (srca & srcc)))", 7 },
/* 44 */{ "(srcb & ~srcc)", 6 },
/* 45 */{ "~(srcc | (srca & ~srcb))", 7 },
/* 46 */{ "(srcc ^ (srcb | (srca & srcc)))", 7 },
/* 47 */{ "~(srca ^ (srcb & (srca ^ srcc)))", 7 },
/* 48 */{ "(srcb & (srca ^ srcc))", 7 },
/* 49 */{ "~(srca ^ srcc ^ (srcb | (srca & srcc)))", 7 },
/* 4a */{ "(srcc ^ (srca & (srcb | srcc)))", 7 },
/* 4b */{ "(srca ^ (~srcb | srcc))", 7 },
/* 4c */{ "(srcb & ~(srca & srcc))", 7 },
/* 4d */{ "(srca ^ ((srca ^ srcb) | ~(srca ^ srcc)))", 7 },
/* 4e */{ "(srca ^ (srcc | (srca ^ srcb)))", 7 },
/* 4f */{ "~(srca & (~srcb | srcc))", 7 },
/* 50 */{ "(srca & ~srcc)", 5 },
/* 51 */{ "~(srcc | (~srca & srcb))", 7 },
/* 52 */{ "(srcc ^ (srca | (srcb & srcc)))", 7 },
/* 53 */{ "~(srcb ^ (srca & (srcb ^ srcc)))", 7 },
/* 54 */{ "(~srcc & (srca | srcb))", 7 },
/* 55 */{ "~srcc", 4 },
/* 56 */{ "(srcc ^ (srca | srcb))", 7 },
/* 57 */{ "~(srcc & (srca | srcb))", 7 },
/* 58 */{ "(srca ^ (srcc & (srca | srcb)))", 7 },
/* 59 */{ "(srcc ^ (srca | ~srcb))", 7 },
/* 5a */{ "(srca ^ srcc)", 5 },
/* 5b */{ "(srca ^ (srcc | ~(srca | srcb)))", 7 },
/* 5c */{ "(srcc ^ (srca | (srcb ^ srcc)))", 7 },
/* 5d */{ "~(srcc & (srca | ~srcb))", 7 },
/* 5e */{ "(srca ^ (srcc | (srca ^ (srca | srcb))))", 7 },
/* 5f */{ "~(srca & srcc)", 5 },
/* 60 */{ "(srca & (srcb ^ srcc))", 7 },
/* 61 */{ "~(srcb ^ srcc ^ (srca | (srcb & srcc)))", 7 },
/* 62 */{ "(srcc ^ (srcb & (srca | srcc)))", 7 },
/* 63 */{ "(srcb ^ (~srca | srcc))", 7 },
/* 64 */{ "(srcb ^ (srcc & (srca | srcb)))", 7 },
/* 65 */{ "(srcc ^ (~srca | srcb))", 7 },
/* 66 */{ "(srcb ^ srcc)", 6 },
/* 67 */{ "(srcb ^ (srcc | ~(srca | srcb)))", 7 },
/* 68 */{ "((srca & srcb) ^ (srcc & (srca | srcb)))", 7 },
/* 69 */{ "~(srca ^ srcb ^ srcc)", 7 },
/* 6a */{ "(srcc ^ (srca & srcb))", 7 },
/* 6b */{ "~(srca ^ srcb ^ (srcc & (srca | srcb)))", 7 },
/* 6c */{ "(srcb ^ (srca & srcc))", 7 },
/* 6d */{ "~(srca ^ srcc ^ (srcb & (srca | srcc)))", 7 },
/* 6e */{ "((~srca & srcb) | (srcb ^ srcc))", 7 },
/* 6f */{ "(~srca | (srcb ^ srcc))", 7 },
/* 70 */{ "(srca & ~(srcb & srcc))", 7 },
/* 71 */{ "~(srca ^ ((srca ^ srcb) | (srca ^ srcc)))", 7 },
/* 72 */{ "(srcb ^ (srcc | (srca ^ srcb)))", 7 },
/* 73 */{ "~(srcb & (~srca | srcc))", 7 },
/* 74 */{ "(srcc ^ (srcb | (srca ^ srcc)))", 7 },
/* 75 */{ "~(srcc & (~srca | srcb))", 7 },
/* 76 */{ "(srcb ^ (srcc | (srca ^ (srca & srcb))))", 7 },
/* 77 */{ "~(srcb & srcc)", 6 },
/* 78 */{ "(srca ^ (srcb & srcc))", 7 },
/* 79 */{ "~(srcb ^ srcc ^ (srca & (srcb | srcc)))", 7 },
/* 7a */{ "((srca & ~srcb) | (srca ^ srcc))", 7 },
/* 7b */{ "(~srcb | (srca ^ srcc))", 7 },
/* 7c */{ "((srca ^ srcb) | (srca & ~srcc))", 7 },
/* 7d */{ "(~srcc | (srca ^ srcb))", 7 },
/* 7e */{ "((srca ^ srcb) | (srca ^ srcc))", 7 },
/* 7f */{ "~(srca & srcb & srcc)", 7 },
/* 80 */{ "(srca & srcb & srcc)", 7 },
/* 81 */{ "~((srca ^ srcb) | (srca ^ srcc))", 7 },
/* 82 */{ "(srcc & ~(srca ^ srcb))", 7 },
/* 83 */{ "(srca ^ (~srcb | (srca & ~srcc)))", 7 },
/* 84 */{ "(srcb & ~(srca ^ srcc))", 7 },
/* 85 */{ "(srca ^ (~srcc | (srca & ~srcb)))", 7 },
/* 86 */{ "(srcb ^ srcc ^ (srca & (srcb | srcc)))", 7 },
/* 87 */{ "~(srca ^ (srcb & srcc))", 7 },
/* 88 */{ "(srcb & srcc)", 6 },
/* 89 */{ "(srcb ^ (~srcc & (~srca | srcb)))", 7 },
/* 8a */{ "(srcc & (~srca | srcb))", 7 },
/* 8b */{ "(srca ^ (~srcb | (srca ^ srcc)))", 7 },
/* 8c */{ "(srcb & (~srca | srcc))", 7 },
/* 8d */{ "(srca ^ (~srcc | (srca ^ srcb)))", 7 },
/* 8e */{ "(srca ^ ((srca ^ srcb) | (srca ^ srcc)))", 7 },
/* 8f */{ "(~srca | (srcb & srcc))", 7 },
/* 90 */{ "(srca & ~(srcb ^ srcc))", 7 },
/* 91 */{ "(srcb ^ (~srcc | (~srca & srcb)))", 7 },
/* 92 */{ "(srca ^ srcc ^ (srcb & (srca | srcc)))", 7 },
/* 93 */{ "~(srcb ^ (srca & srcc))", 7 },
/* 94 */{ "(srca ^ srcb ^ (srcc & (srca | srcb)))", 7 },
/* 95 */{ "~(srcc ^ (srca & srcb))", 7 },
/* 96 */{ "(srca ^ srcb ^ srcc)", 7 },
/* 97 */{ "(srca ^ srcb ^ (srcc | ~(srca | srcb)))", 7 },
/* 98 */{ "(srcb ^ (~srcc & (srca | srcb)))", 7 },
/* 99 */{ "~(srcb ^ srcc)", 6 },
/* 9a */{ "(srcc ^ (srca & ~srcb))", 7 },
/* 9b */{ "~(srcb ^ (srcc & (srca | srcb)))", 7 },
/* 9c */{ "(srcb ^ (srca & ~srcc))", 7 },
/* 9d */{ "~(srcc ^ (srcb & (srca | srcc)))", 7 },
/* 9e */{ "(srcb ^ srcc ^ (srca | (srcb & srcc)))", 7 },
/* 9f */{ "~(srca & (srcb ^ srcc))", 7 },
/* a0 */{ "(srca & srcc)", 5 },
/* a1 */{ "(srca ^ (~srcc & (srca | ~srcb)))", 7 },
/* a2 */{ "(srcc & (srca | ~srcb))", 7 },
/* a3 */{ "(srcb ^ (~srca | (srcb ^ srcc)))", 7 },
/* a4 */{ "(srca ^ (~srcc & (srca | srcb)))", 7 },
/* a5 */{ "~(srca ^ srcc)", 5 },
/* a6 */{ "(srcc ^ (~srca & srcb))", 7 },
/* a7 */{ "~(srca ^ (srcc & (srca | srcb)))", 7 },
/* a8 */{ "(srcc & (srca | srcb))", 7 },
/* a9 */{ "~(srcc ^ (srca | srcb))", 7 },
/* aa */{ "srcc", 4 },
/* ab */{ "(srcc | ~(srca | srcb))", 7 },
/* ac */{ "(srcb ^ (srca & (srcb ^ srcc)))", 7 },
/* ad */{ "~(srcc ^ (srca | (srcb & srcc)))", 7 },
/* ae */{ "(srcc | (~srca & srcb))", 7 },
/* af */{ "(~srca | srcc)", 5 },
/* b0 */{ "(srca & (~srcb | srcc))", 7 },
/* b1 */{ "~(srca ^ (srcc | (srca ^ srcb)))", 7 },
/* b2 */{ "(srca ^ ((srca ^ srcc) & (srcb ^ srcc)))", 7 },
/* b3 */{ "(~srcb | (srca & srcc))", 7 },
/* b4 */{ "(srca ^ (srcb & ~srcc))", 7 },
/* b5 */{ "~(srcc ^ (srca & (srcb | srcc)))", 7 },
/* b6 */{ "(srca ^ srcc ^ (srcb | (srca & srcc)))", 7 },
/* b7 */{ "~(srcb & (srca ^ srcc))", 7 },
/* b8 */{ "(srca ^ (srcb & (srca ^ srcc)))", 7 },
/* b9 */{ "~(srcc ^ (srcb | (srca & srcc)))", 7 },
/* ba */{ "(srcc | (srca & ~srcb))", 7 },
/* bb */{ "(~srcb | srcc)", 6 },
/* bc */{ "((srca ^ srcb) | (srca & srcc))", 7 },
/* bd */{ "((srca ^ srcb) | ~(srca ^ srcc))", 7 },
/* be */{ "(srcc | (srca ^ srcb))", 7 },
/* bf */{ "(srcc | ~(srca & srcb))", 7 },
/* c0 */{ "(srca & srcb)", 3 },
/* c1 */{ "(srca ^ (~srcb & (srca | ~srcc)))", 7 },
/* c2 */{ "(srca ^ (~srcb & (srca | srcc)))", 7 },
/* c3 */{ "~(srca ^ srcb)", 3 },
/* c4 */{ "(srcb & (srca | ~srcc))", 7 },
/* c5 */{ "~(srcb ^ (srca | (srcb ^ srcc)))", 7 },
/* c6 */{ "(srcb ^ (~srca & srcc))", 7 },
/* c7 */{ "~(srca ^ (srcb & (srca | srcc)))", 7 },
/* c8 */{ "(srcb & (srca | srcc))", 7 },
/* c9 */{ "~(srcb ^ (srca | srcc))", 7 },
/* ca */{ "(srcc ^ (srca & (srcb ^ srcc)))", 7 },
/* cb */{ "~(srcb ^ (srca | (srcb & srcc)))", 7 },
/* cc */{ "srcb", 2 },
/* cd */{ "(srcb | ~(srca | srcc))", 7 },
/* ce */{ "(srcb | (~srca & srcc))", 7 },
/* cf */{ "(~srca | srcb)", 3 },
/* d0 */{ "(srca & (srcb | ~srcc))", 7 },
/* d1 */{ "~(srca ^ (srcb | (srca ^ srcc)))", 7 },
/* d2 */{ "(srca ^ (~srcb & srcc))", 7 },
/* d3 */{ "~(srcb ^ (srca & (srcb | srcc)))", 7 },
/* d4 */{ "(srca ^ ((srca ^ srcb) & (srcb ^ srcc)))", 7 },
/* d5 */{ "(~srcc | (srca & srcb))", 7 },
/* d6 */{ "(srca ^ srcb ^ (srcc | (srca & srcb)))", 7 },
/* d7 */{ "~(srcc & (srca ^ srcb))", 7 },
/* d8 */{ "(srca ^ (srcc & (srca ^ srcb)))", 7 },
/* d9 */{ "~(srcb ^ (srcc | (srca & srcb)))", 7 },
/* da */{ "((srca & srcb) | (srca ^ srcc))", 7 },
/* db */{ "~((srca ^ srcb) & (srcb ^ srcc))", 7 },
/* dc */{ "(srcb | (srca & ~srcc))", 7 },
/* dd */{ "(srcb | ~srcc)", 6 },
/* de */{ "(srcb | (srca ^ srcc))", 7 },
/* df */{ "(srcb | ~(srca & srcc))", 7 },
/* e0 */{ "(srca & (srcb | srcc))", 7 },
/* e1 */{ "~(srca ^ (srcb | srcc))", 7 },
/* e2 */{ "(srcc ^ (srcb & (srca ^ srcc)))", 7 },
/* e3 */{ "~(srca ^ (srcb | (srca & srcc)))", 7 },
/* e4 */{ "(srcb ^ (srcc & (srca ^ srcb)))", 7 },
/* e5 */{ "~(srca ^ (srcc | (srca & srcb)))", 7 },
/* e6 */{ "((srca & srcb) | (srcb ^ srcc))", 7 },
/* e7 */{ "~((srca ^ srcb) & (srca ^ srcc))", 7 },
/* e8 */{ "(srca ^ ((srca ^ srcb) & (srca ^ srcc)))", 7 },
/* e9 */{ "(srca ^ srcb ^ (~srcc | (srca & srcb)))", 7 },
/* ea */{ "(srcc | (srca & srcb))", 7 },
/* eb */{ "(srcc | ~(srca ^ srcb))", 7 },
/* ec */{ "(srcb | (srca & srcc))", 7 },
/* ed */{ "(srcb | ~(srca ^ srcc))", 7 },
/* ee */{ "(srcb | srcc)", 6 },
/* ef */{ "(~srca | srcb | srcc)", 7 },
/* f0 */{ "srca", 1 },
/* f1 */{ "(srca | ~(srcb | srcc))", 7 },
/* f2 */{ "(srca | (~srcb & srcc))", 7 },
/* f3 */{ "(srca | ~srcb)", 3 },
/* f4 */{ "(srca | (srcb & ~srcc))", 7 },
/* f5 */{ "(srca | ~srcc)", 5 },
/* f6 */{ "(srca | (srcb ^ srcc))", 7 },
/* f7 */{ "(srca | ~(srcb & srcc))", 7 },
/* f8 */{ "(srca | (srcb & srcc))", 7 },
/* f9 */{ "(srca | ~(srcb ^ srcc))", 7 },
/* fa */{ "(srca | srcc)", 5 },
/* fb */{ "(srca | ~srcb | srcc)", 7 },
/* fc */{ "(srca | srcb)", 3 },
/* fd */{ "(srca | srcb | ~srcc)", 7 },
/* fe */{ "(srca | srcb | srcc)", 7 },
/* ff */{ "0xFFFFFFFF", 0 }
};

6
src/blittable.cpp
View file

@ -1,9 +1,7 @@
#include "sysconfig.h"
#include "sysdeps.h"
#include "options.h"
#include "include/memory.h"
#include "newcpu.h"
#include "custom.h"
#include "memory.h"
//#include "newcpu.h"
#include "savestate.h"
#include "blitter.h"
#include "blitfunc.h"

5
src/blitter.cpp
View file

@ -6,13 +6,12 @@
* (c) 1995 Bernd Schmidt, Alessandro Bissacco
* (c) 2002 - 2005 Toni Wilen
*/
#include <stdbool.h>
#include "sysconfig.h"
#include "sysdeps.h"
#include "options.h"
#include "uae.h"
#include "include/memory.h"
#include "memory.h"
#include "custom.h"
#include "newcpu.h"
#include "savestate.h"

9
src/blkdev.cpp
View file

@ -7,19 +7,18 @@
*
*/
#include "sysconfig.h"
#include <stdbool.h>
#include <string.h>
#include <unistd.h>
#include "sysdeps.h"
#include "options.h"
#include "include/memory.h"
#include "traps.h"
#include "blkdev.h"
#include "savestate.h"
#include "crc32.h"
#include "threaddep/thread.h"
#include "execio.h"
#include "zfile.h"
#include "fsdb.h"
#define PRE_INSERT_DELAY (3 * (currprefs.ntscmode ? 60 : 50))

11
src/blkdev_cdimage.cpp
View file

@ -11,13 +11,16 @@
* Copyright 2010-2013 Toni Wilen
*
*/
#include "sysconfig.h"
#include "sysdeps.h"
#include <string.h>
#include <stdlib.h>
#include <stdbool.h>
#include <sys/timeb.h>
#include <sys/types.h>
#include <sys/wait.h>
#include "sysdeps.h"
#include "options.h"
#include "traps.h"
#include "blkdev.h"
#include "zfile.h"
#include "gui.h"
@ -26,9 +29,7 @@
#include "mp3decoder.h"
#include "cda_play.h"
#include "include/memory.h"
#include "audio.h"
#include "uae.h"
#include "uae/cdrom.h"
#define FLAC__NO_DLL
#include "FLAC/stream_decoder.h"

20
src/bsdsocket.cpp
View file

@ -8,18 +8,23 @@
* Library initialization code (c) Tauno Taipaleenmaki
*/
#include "sysconfig.h"
#include <stddef.h>
#include <string.h>
#include <stdlib.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <netdb.h>
#include <unistd.h>
#include "sysdeps.h"
#include <assert.h>
#include <stddef.h>
#include "options.h"
#include "include/memory.h"
#include "custom.h"
#include "newcpu.h"
#include "autoconf.h"
#include "traps.h"
#include "threaddep/thread.h"
#include "bsdsocket.h"
#include "native2amiga.h"
@ -1049,9 +1054,6 @@ static uae_u32 REGPARAM2 bsdsocklib_Dup2Socket (TrapContext *ctx)
return host_dup2socket(ctx, sb, trap_get_dreg(ctx, 0), trap_get_dreg(ctx, 1));
}
#define MSG_EOR 0x08 /* data completes record */
#define MSG_TRUNC 0x10 /* data discarded before delivery */
static uae_u32 REGPARAM2 bsdsocklib_sendmsg (TrapContext *ctx)
{
struct socketbase *sb = get_socketbase (ctx);

341
src/build68k.cpp
View file

@ -1,341 +0,0 @@
/*
* UAE - The Un*x Amiga Emulator
*
* Read 68000 CPU specs from file "table68k" and build table68k.c
*
* Copyright 1995,1996 Bernd Schmidt
*/
#include "sysconfig.h"
#include "sysdeps.h"
#include <stdlib.h>
#include <tchar.h>
#include <assert.h>
#include <ctype.h>
#define TCHAR char
#include "readcpu.h"
static FILE *tablef;
static int nextch = 0;
static void getnextch(void)
{
do {
nextch = fgetc(tablef);
if (nextch == '%') {
do {
nextch = fgetc(tablef);
} while (nextch != EOF && nextch != '\n');
}
} while (nextch != EOF && isspace(nextch));
}
static int nextchtohex(void)
{
switch (isupper (nextch) ? tolower (nextch) : nextch) {
case '0': return 0;
case '1': return 1;
case '2': return 2;
case '3': return 3;
case '4': return 4;
case '5': return 5;
case '6': return 6;
case '7': return 7;
case '8': return 8;
case '9': return 9;
case 'a': return 10;
case 'b': return 11;
case 'c': return 12;
case 'd': return 13;
case 'e': return 14;
case 'f': return 15;
default: abort();
}
}
int main(int argc, char **argv)
{
int no_insns = 0;
printf ("#include \"sysconfig.h\"\n");
printf ("#include \"sysdeps.h\"\n");
printf ("#include \"readcpu.h\"\n");
printf ("struct instr_def defs68k[] = {\n");
tablef = stdin;
getnextch();
while (nextch != EOF) {
int cpulevel, uncpulevel, plevel, sduse;
int i;
char opcstr[256];
int bitpos[16];
int flagset[5], flaguse[5];
char cflow;
unsigned int bitmask,bitpattern;
int n_variable;
int head = 0, tail = 0, clocks = 0, fetchmode = 0;
n_variable = 0;
bitmask = bitpattern = 0;
memset (bitpos, 0, sizeof(bitpos));
for(i=0; i<16; i++) {
int currbit;
bitmask <<= 1;
bitpattern <<= 1;
switch (nextch) {
case '0': currbit = bit0; bitmask |= 1; break;
case '1': currbit = bit1; bitmask |= 1; bitpattern |= 1; break;
case 'c': currbit = bitc; break;
case 'C': currbit = bitC; break;
case 'f': currbit = bitf; break;
case 'i': currbit = biti; break;
case 'I': currbit = bitI; break;
case 'j': currbit = bitj; break;
case 'J': currbit = bitJ; break;
case 'k': currbit = bitk; break;
case 'K': currbit = bitK; break;
case 's': currbit = bits; break;
case 'S': currbit = bitS; break;
case 'd': currbit = bitd; break;
case 'D': currbit = bitD; break;
case 'r': currbit = bitr; break;
case 'R': currbit = bitR; break;
case 'z': currbit = bitz; break;
case 'E': currbit = bitE; break;
case 'p': currbit = bitp; break;
default: abort();
}
if (!(bitmask & 1)) {
bitpos[n_variable] = currbit;
n_variable++;
}
if (nextch == '0' || nextch == '1')
bitmask |= 1;
if (nextch == '1')
bitpattern |= 1;
getnextch();
}
while (isspace(nextch) || nextch == ':') /* Get CPU level, unimplemented level, and privilege level */
getnextch();
switch (nextch) {
case '0': cpulevel = 0; break;
case '1': cpulevel = 1; break;
case '2': cpulevel = 2; break;
case '3': cpulevel = 3; break;
case '4': cpulevel = 4; break;
case '5': cpulevel = 5; break;
case '6': cpulevel = 6; break;
case '7': cpulevel = 7; break;
default: abort();
}
getnextch();
switch (nextch) {
case '0': uncpulevel = 0; break;
case '1': uncpulevel = 1; break;
case '2': uncpulevel = 2; break;
case '3': uncpulevel = 3; break;
case '4': uncpulevel = 4; break;
case '5': uncpulevel = 5; break;
case '6': uncpulevel = 6; break;
case '7': uncpulevel = 7; break;
default: abort();
}
getnextch();
switch (nextch) {
case '0': plevel = 0; break;
case '1': plevel = 1; break;
case '2': plevel = 2; break;
case '3': plevel = 3; break;
default: abort();
}
getnextch();
while (isspace(nextch)) /* Get flag set information */
getnextch();
if (nextch != ':')
abort();
for(i = 0; i < 5; i++) {
getnextch();
switch(nextch) {
case '-': flagset[i] = fa_unset; break;
case '/': flagset[i] = fa_isjmp; break;
case '+': flagset[i] = fa_isbranch; break;
case '0': flagset[i] = fa_zero; break;
case '1': flagset[i] = fa_one; break;
case 'x': flagset[i] = fa_dontcare; break;
case '?': flagset[i] = fa_unknown; break;
default: flagset[i] = fa_set; break;
}
}
getnextch();
while (isspace(nextch))
getnextch();
if (nextch != ':') /* Get flag used information */
abort();
for(i = 0; i < 5; i++) {
getnextch();
switch(nextch) {
case '-': flaguse[i] = fu_unused; break;
case '/': flaguse[i] = fu_isjmp; break;
case '+': flaguse[i] = fu_maybecc; break;
case '?': flaguse[i] = fu_unknown; break;
default: flaguse[i] = fu_used; break;
}
}
getnextch();
while (isspace(nextch))
getnextch();
if (nextch != ':') /* Get control flow information */
abort();
cflow = 0;
for(i = 0; i < 2; i++) {
getnextch();
switch(nextch) {
case '-': break;
case 'R': cflow |= fl_return; break;
case 'B': cflow |= fl_branch; break;
case 'J': cflow |= fl_jump; break;
case 'T': cflow |= fl_trap; break;
default: abort();
}
}
getnextch();
while (isspace(nextch))
getnextch();
if (nextch != ':') /* Get source/dest usage information */
abort();
getnextch();
sduse = nextchtohex() << 4;
getnextch();
sduse |= nextchtohex();
getnextch();
while (isspace(nextch))
getnextch();
if (nextch != ':')
abort();
if (fgets(opcstr, 250, tablef) != opcstr) {
abort();
}
getnextch();
if (nextch == '-') {
int neg;
char fm[20];
getnextch();
while (isspace(nextch))
getnextch();
neg = 1;
if (nextch == '-') {
neg = -1;
getnextch();
}
for (;;) {
if (nextch < '0' || nextch > '9')
break;
head *= 10;
head += nextch - '0';
nextch = fgetc (tablef);
}
head *= neg;
while (isspace(nextch))
getnextch();
for (;;) {
if (nextch < '0' || nextch > '9')
break;
tail *= 10;
tail += nextch - '0';
nextch = fgetc (tablef);
}
while (isspace(nextch))
getnextch();
for (;;) {
if (nextch < '0' || nextch > '9')
break;
clocks *= 10;
clocks += nextch - '0';
nextch = fgetc (tablef);
}
if (nextch == ' ') {
if (fgets(fm, sizeof fm, tablef) != fm) {
abort();
}
if (!strnicmp(fm, "fea", 3))
fetchmode = 1;
if (!strnicmp(fm, "cea", 3))
fetchmode = 2;
if (!strnicmp(fm, "fiea", 4))
fetchmode = 3;
if (!strnicmp(fm, "ciea", 4))
fetchmode = 4;
if (!strnicmp(fm, "jea", 3))
fetchmode = 5;
}
getnextch();
}
int j;
/* Remove superfluous spaces from the string */
char *opstrp = opcstr, *osendp;
char tmp[100], *p;
int slen = 0;
while (isspace((int)*opstrp))
opstrp++;
osendp = opstrp;
while (*osendp) {
if (!isspace ((int)*osendp))
slen = osendp - opstrp + 1;
osendp++;
}
opstrp[slen] = 0;
if (no_insns > 0)
printf(",\n");
no_insns++;
strcpy (tmp, opstrp);
strcat (tmp, " ");
p = tmp;
while (!isspace(*p++));
*p = 0;
printf("/* %s */\n", tmp);
printf("{0x%04X,%2d,{", bitpattern, n_variable);
for (j = 0; j < 16; j++) {
printf("%2d", bitpos[j]);
if (j < 15)
printf(",");
}
printf ("},0x%04X,%d,%d,%d,{", bitmask, cpulevel, uncpulevel, plevel);
for(i = 0; i < 5; i++) {
printf("{%d,%d}%s", flaguse[i], flagset[i], i == 4 ? "" : ",");
}
printf("}, %2d, %2d,_T(\"%s\"),%2d,%2d,%2d,%2d}", cflow, sduse, opstrp, head, tail, clocks, fetchmode);
}
printf("};\nint n_defs68k = %d;\n", no_insns);
return 0;
}

9
src/calc.cpp
View file

@ -13,15 +13,10 @@
*/
#define calc_log(x)
#include "sysconfig.h"
#include <stdio.h>
#include <stdbool.h>
#include "sysdeps.h"
#include "calc.h"
#include <string.h>
#include <stdio.h>
#define STACK_SIZE 32
#define MAX_VALUES 32
#define IOBUFFERS 256

5
src/caps/caps_win32.cpp
View file

@ -1,4 +1,5 @@
#include "sysconfig.h"
#include <stdio.h>
#include <stdbool.h>
#include "sysdeps.h"
#ifdef CAPS
@ -367,4 +368,4 @@ int caps_loadtrack (uae_u16 *mfmbuf, uae_u16 *tracktiming, int drv, int track, i
return 1;
}
#endif /* CAPS */
#endif /* CAPS */

14
src/cd32_fmv.cpp
View file

@ -7,20 +7,18 @@
*
*/
#include "sysconfig.h"
#include <stdbool.h>
#include <string.h>
#include <sys/types.h>
#include <sys/wait.h>
#include "sysdeps.h"
#include "options.h"
#include "include/memory.h"
#include "memory.h"
#include "rommgr.h"
#include "custom.h"
#include "newcpu.h"
#include "zfile.h"
#include "cd32_fmv.h"
#include "uae.h"
#include "custom.h"
#include "audio.h"
#include "threaddep/thread.h"
#include "cda_play.h"
#include "archivers/mp2/kjmp2.h"

7
src/cd32_fmv_genlock.cpp
View file

@ -7,13 +7,10 @@
*
*/
#include "sysconfig.h"
#include <string.h>
#include "sysdeps.h"
#include "options.h"
#include "memory.h"
#include "cd32_fmv.h"
#include "custom.h"
#include "xwin.h"
static uae_u8 *mpeg_out_buffer;

5
src/cdrom.cpp
View file

@ -1,7 +1,6 @@
#include "sysconfig.h"
#include "sysdeps.h"
#include <string.h>
#include "uae/cdrom.h"
#include "sysconfig.h"
/* CDROM MODE 1 EDC/ECC code (from Reed-Solomon library by Heiko Eissfeldt) */

12
src/cfgfile.cpp
View file

@ -7,18 +7,21 @@
* Copyright 1998 Brian King, Bernd Schmidt
*/
#include "sysconfig.h"
#include <stdio.h>
#include <stdbool.h>
#include <string.h>
#include <stdarg.h>
#include <stdlib.h>
#include "sysdeps.h"
#include <ctype.h>
#include "options.h"
#include "memory.h"
#include "uae.h"
#include "audio.h"
#include "custom.h"
#include "inputdevice.h"
#include "savestate.h"
#include "include/memory.h"
#include "autoconf.h"
#include "rommgr.h"
#include "gui.h"
@ -30,7 +33,6 @@
#include "blkdev.h"
#include "calc.h"
#include "gfxboard.h"
#include "native2amiga_api.h"
#define cfgfile_warning write_log
#define cfgfile_warning_obsolete write_log

12
src/cia.cpp
View file

@ -6,29 +6,25 @@
* Copyright 1995 Bernd Schmidt, Alessandro Bissacco
* Copyright 1996, 1997 Stefan Reinauer, Christian Schmitt
*/
#include <stdbool.h>
#include <time.h>
#include <string.h>
#include "sysconfig.h"
#include "sysdeps.h"
#include <assert.h>
#include "options.h"
#include "include/memory.h"
#include "memory.h"
#include "custom.h"
#include "newcpu.h"
#include "cia.h"
#include "disk.h"
#include "xwin.h"
#include "keybuf.h"
#include "gui.h"
#include "savestate.h"
#include "inputdevice.h"
#include "zfile.h"
#include "include/ar.h"
#include "akiko.h"
#include "audio.h"
#include "keyboard.h"
#include "uae.h"
#include "autoconf.h"
#include "rtc.h"
/* Akiko internal CIA differences:

1
src/cpudefs.cpp
View file

@ -1,4 +1,3 @@
#include "sysconfig.h"
#include "sysdeps.h"
#include "readcpu.h"
struct instr_def defs68k[] = {

6
src/cpuemu_0.cpp
View file

@ -1,11 +1,9 @@
#include "sysconfig.h"
#include <stdbool.h>
#include "sysdeps.h"
#include "options.h"
#include "include/memory.h"
#include "custom.h"
#include "newcpu.h"
#include "cpu_prefetch.h"
#include "cputbl.h"
#define CPUFUNC(x) x##_ff
#define SET_CFLG_ALWAYS(x) SET_CFLG(x)
#define SET_NFLG_ALWAYS(x) SET_NFLG(x)

3
src/cpuemu_11.cpp
View file

@ -1,11 +1,8 @@
#include "sysconfig.h"
#include "sysdeps.h"
#include "options.h"
#include "memory.h"
#include "custom.h"
#include "newcpu.h"
#include "cpu_prefetch.h"
#include "cputbl.h"
#define CPUFUNC(x) x##_ff
#define SET_CFLG_ALWAYS(x) SET_CFLG(x)
#define SET_NFLG_ALWAYS(x) SET_NFLG(x)

3
src/cpuemu_4.cpp
View file

@ -1,11 +1,8 @@
#include "sysconfig.h"
#include "sysdeps.h"
#include "options.h"
#include "memory.h"
#include "custom.h"
#include "newcpu.h"
#include "cpu_prefetch.h"
#include "cputbl.h"
#define CPUFUNC(x) x##_ff
#define SET_CFLG_ALWAYS(x) SET_CFLG(x)
#define SET_NFLG_ALWAYS(x) SET_NFLG(x)

6
src/cpuemu_40.cpp
View file

@ -1,11 +1,9 @@
#include "sysconfig.h"
#include <stdbool.h>
#include "sysdeps.h"
#include "options.h"
#include "memory.h"
#include "custom.h"
#include "newcpu.h"
#include "cpu_prefetch.h"
#include "cputbl.h"
#define CPUFUNC(x) x##_ff
#define SET_CFLG_ALWAYS(x) SET_CFLG(x)
#define SET_NFLG_ALWAYS(x) SET_NFLG(x)

3
src/cpuemu_44.cpp
View file

@ -1,11 +1,8 @@
#include "sysconfig.h"
#include "sysdeps.h"
#include "options.h"
#include "memory.h"
#include "custom.h"
#include "newcpu.h"
#include "cpu_prefetch.h"
#include "cputbl.h"
#define CPUFUNC(x) x##_ff
#define SET_CFLG_ALWAYS(x) SET_CFLG(x)
#define SET_NFLG_ALWAYS(x) SET_NFLG(x)

3
src/cpustbl.cpp
View file

@ -1,10 +1,7 @@
#include "sysconfig.h"
#include "sysdeps.h"
#include "options.h"
#include "memory.h"
#include "custom.h"
#include "newcpu.h"
#include "cpu_prefetch.h"
#include "cputbl.h"
#define CPUFUNC(x) x##_ff
#define SET_CFLG_ALWAYS(x) SET_CFLG(x)

2
src/crc32.cpp
View file

@ -1,5 +1,5 @@
#include <string.h>
#include "sysconfig.h"
#include "sysdeps.h"
#include "crc32.h"

11
src/custom.cpp
View file

@ -7,13 +7,15 @@
* Copyright 1995 Alessandro Bissacco
* Copyright 2000-2015 Toni Wilen
*/
#include <stdarg.h>
#include <stdbool.h>
#include <string.h>
#include <math.h>
#include <stdlib.h>
#include <sys/time.h>
#include "sysconfig.h"
#include "sysdeps.h"
#include <cctype>
#include <cmath>
#include "options.h"
#include "uae.h"
#include "audio.h"
@ -27,7 +29,6 @@
#include "xwin.h"
#include "inputdevice.h"
#include "autoconf.h"
#include "traps.h"
#include "gui.h"
#include "picasso96.h"
#include "drawing.h"

7
src/devices.cpp
View file

@ -1,13 +1,9 @@
#include "sysconfig.h"
#include "sysdeps.h"
#include "options.h"
#include "threaddep/thread.h"
#include "traps.h"
#include "thread.h"
#include "memory.h"
#include "audio.h"
#include "gfxboard.h"
#include "scsi.h"
#include "cd32_fmv.h"
#include "akiko.h"
#include "gayle.h"
@ -16,7 +12,6 @@
#include "inputdevice.h"
#include "picasso96.h"
#include "blkdev.h"
#include "picasso96.h"
#include "autoconf.h"
#include "newcpu.h"
#include "savestate.h"

9
src/disk.cpp
View file

@ -11,7 +11,12 @@
*
*/
#include "sysconfig.h"
#include <string.h>
#include <ctype.h>
#include <sys/time.h>
#include <stdbool.h>
#include <stdlib.h>
#include "sysdeps.h"
#define MFM_VALIDATOR 0
@ -24,7 +29,6 @@
#include "gui.h"
#include "zfile.h"
#include "newcpu.h"
#include "execlib.h"
#include "savestate.h"
#include "cia.h"
#ifdef FDI2RAW
@ -35,7 +39,6 @@
#endif
#include "crc32.h"
#include "fsdb.h"
#include "rommgr.h"
static int longwritemode = 0;

3
src/diskutil.cpp
View file

@ -1,8 +1,7 @@
#include "sysconfig.h"
#include <string.h>
#include "sysdeps.h"
#include "crc32.h"
#include "diskutil.h"
#define MFMMASK 0x55555555
static uae_u32 getmfmlong(uae_u16 * mbuf)

6
src/dlopen.cpp
View file

@ -1,8 +1,6 @@
#include "sysconfig.h"
#include <dlfcn.h>
#include "sysdeps.h"
#include "uae/api.h"
#include "uae/dlopen.h"
//#include "uae/log.h"
#define FSUAE
@ -112,4 +110,4 @@ void uae_dlopen_patch_common(UAE_DLHANDLE handle)
write_log(_T("DLOPEN: Patching common functions\n"));
// *((uae_log_function *)ptr) = &uae_log;
}
}
}

14
src/drawing.cpp
View file

@ -26,11 +26,11 @@
To prevent extremely bad things (think pixels cut in half by window borders) from
happening, all ports should restrict window widths to be multiples of 16 pixels. */
#include "sysconfig.h"
#include "sysdeps.h"
#include <stdbool.h>
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#include <assert.h>
#include "sysdeps.h"
#include "options.h"
#include "threaddep/thread.h"
@ -39,13 +39,11 @@
#include "custom.h"
#include "newcpu.h"
#include "xwin.h"
#include "autoconf.h"
#include "gui.h"
#include "picasso96.h"
#include "drawing.h"
#include "savestate.h"
#include "statusline.h"
#include "inputdevice.h"
#include "cd32_fmv.h"
#include "audio.h"
#include "devices.h"
@ -1018,7 +1016,7 @@ STATIC_INLINE bool get_genlock_transparency(uae_u8 v)
}
}
#include "linetoscr.cpp"
#include "linetoscr.cpp.in"
#define LTPARMS src_pixel, start, stop
@ -3543,4 +3541,4 @@ int isvsync(void)
if (picasso_on)
return isvsync_rtg();
return isvsync_chipset();
}
}

2
src/events.cpp
View file

@ -7,8 +7,8 @@
* Copyright 1995 Alessandro Bissacco
* Copyright 2000-2012 Toni Wilen
*/
#include <stdbool.h>
#include "sysconfig.h"
#include "sysdeps.h"
#include "options.h"

9
src/expansion.cpp
View file

@ -8,25 +8,20 @@
* - added gfxcard code
*
*/
#include <string.h>
#include <stdbool.h>
#include "sysconfig.h"
#include "sysdeps.h"
#include "options.h"
#include "uae.h"
#include "traps.h"
#include "memory.h"
#include "rommgr.h"
#include "custom.h"
#include "newcpu.h"
#include "savestate.h"
#include "zfile.h"
#include "threaddep/thread.h"
#include "gfxboard.h"
#include "cd32_fmv.h"
#include "gayle.h"
#include "autoconf.h"
#include "filesys.h"
#define CARD_FLAG_CAN_Z3 1

4
src/fdi2raw.cpp
View file

@ -29,17 +29,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
/* IF UAE */
#include "sysconfig.h"
#include "sysdeps.h"
#include "zfile.h"
#include "uae.h"
/* ELSE */
//#include "types.h"
#include "fdi2raw.h"
#include "crc32.h"
@ -47,7 +44,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#undef DEBUG
#define VERBOSE
#include <assert.h>
#ifdef DEBUG
static TCHAR *datalog (uae_u8 *src, int len)

9
src/filesys.cpp
View file

@ -21,17 +21,17 @@
* Will probably fail spectacularly in some cases if the filesystem is
* modified at the same time by another process while UAE is running.
*/
#include <string.h>
#include <stdbool.h>
#include <stdlib.h>
#include "sysconfig.h"
#include "sysdeps.h"
#include "threaddep/thread.h"
#include "options.h"
#include "traps.h"
#include "uae.h"
#include "memory.h"
#include "custom.h"
#include "newcpu.h"
#include "filesys.h"
#include "autoconf.h"
#include "fsusage.h"
@ -45,7 +45,6 @@
#include "bsdsocket.h"
#include "uaeresource.h"
#include "inputdevice.h"
#include "blkdev.h"
#include "picasso96.h"
#include "rommgr.h"
@ -7499,7 +7498,7 @@ void filesys_install_code (void)
bootrom_header = 3 * 4;
align(4);
bootrom_start = here ();
#include "filesys_bootrom.cpp"
#include "filesys_bootrom.cpp.in"
items = dlg (bootrom_start + 8) & 0xffff;
/* The last offset comes from the code itself, look for it near the top. */

2
src/filesys.sh
View file

@ -11,4 +11,4 @@
# delete fs.out
#
# That is what you get if you assemble/link with a68k/blink
od -v -t xC -w8 filesys |tail -n +5 | sed -e "s,^.......,," -e "s,[0123456789abcdefABCDEF][0123456789abcdefABCDEF],db(0x&);,g" > filesys_bootrom.cpp
od -v -t xC -w8 filesys |tail -n +5 | sed -e "s,^.......,," -e "s,[0123456789abcdefABCDEF][0123456789abcdefABCDEF],db(0x&);,g" > filesys_bootrom.cpp.in

0
src/filesys_bootrom.cpp → src/filesys_bootrom.cpp.in
View file

4
src/flashrom.cpp
View file

@ -8,14 +8,10 @@
* (c) 2014 Toni Wilen
*/
#include "sysconfig.h"
#include "sysdeps.h"
#include "options.h"
#include "zfile.h"
#include "flashrom.h"
#include "memory.h"
#include "newcpu.h"
#include "gui.h"
#include "uae.h"

17
src/fpp.cpp
View file

@ -9,27 +9,18 @@
*/
#define __USE_ISOC9X /* We might be able to pick up a NaN */
#include <math.h>
#include <stdbool.h>
#include <cmath>
#include <float.h>
#include <cfenv>
#include "sysconfig.h"
//#include "sysconfig.h"
#include "sysdeps.h"
#include "options.h"
#include "memory.h"
#include "uae/attributes.h"
#include "uae/vm.h"
#include "custom.h"
#include "newcpu.h"
#include "fpp.h"
#include "savestate.h"
#include "cpu_prefetch.h"
static void fpsr_set_exception(uae_u32 exception);
#include "fpp_native.cpp"
#include "fpp_native.cpp.in"
struct fpp_cr_entry {
uae_u32 val[3];

0
src/fpp_native.cpp → src/fpp_native.cpp.in
View file

14
src/fsdb.cpp
View file

@ -7,20 +7,16 @@
* Copyright 1999 Bernd Schmidt
*/
#include "sysconfig.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <strings.h>
#include "sysdeps.h"
#include "options.h"
#include "uae.h"
#include "traps.h"
#include "memory.h"
#include "custom.h"
#include "newcpu.h"
#include "filesys.h"
#include "autoconf.h"
#include "fsusage.h"
#include "fsdb.h"
#include "uae/io.h"
/* The on-disk format is as follows:
* Offset 0, 1 byte, valid

8
src/fsdb_unix.cpp
View file

@ -8,12 +8,14 @@
* Copyright 1999 Bernd Schmidt
*/
#include "sysconfig.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <stdlib.h>
#include "sysdeps.h"
#include "config.h"
#include "fsdb.h"
#include "uae.h"
/* these are deadly (but I think allowed on the Amiga): */
#define NUM_EVILCHARS 7

12
src/fsusage.cpp
View file

@ -15,15 +15,15 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "sysconfig.h"
#include "sysdeps.h"
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/statvfs.h>
#include "sysconfig.h"
#if HAVE_SYS_STATFS_H
# include <sys/statfs.h>
#endif
#if defined(STAT_STATVFS) && !defined(__ANDROID__)
#include <sys/statvfs.h>
#else

12
src/gayle.cpp
View file

@ -10,11 +10,13 @@
#define MBRES_LOG 0
#define PCMCIA_LOG 0
#include "sysconfig.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <string.h>
#include "sysdeps.h"
#include "options.h"
#include "memory.h"
#include "custom.h"
#include "newcpu.h"
@ -22,13 +24,9 @@
#include "gayle.h"
#include "savestate.h"
#include "uae.h"
#include "gui.h"
#include "threaddep/thread.h"
#include "blkdev.h"
#include "scsi.h"
#include "ide.h"
#include "autoconf.h"
#include "rommgr.h"
#define PCMCIA_SRAM 1
#define PCMCIA_IDE 2

188
src/genblitter.cpp
View file

@ -1,188 +0,0 @@
/*
* UAE - The Un*x Amiga Emulator
*
* Optimized blitter minterm function generator
*
* Copyright 1995,1996 Bernd Schmidt
* Copyright 1996 Alessandro Bissacco
*/
#include "sysconfig.h"
#include <stdio.h>
#include <stdlib.h>
#include "genblitter.h"
/* Here is the minterm table used in blitter function generation */
static unsigned char blttbl[]= {
0x00, 0x0a, 0x2a, 0x30, 0x3a, 0x3c, 0x4a, 0x6a, 0x8a, 0x8c, 0x9a, 0xa8,
0xaa, 0xb1, 0xca, 0xcc, 0xd8, 0xe2, 0xea, 0xf0, 0xfa, 0xfc
};
static void generate_include(void)
{
int minterm;
printf("STATIC_INLINE uae_u32 blit_func(const uae_u32 srca, const uae_u32 srcb, const uae_u32 srcc, const uae_u8 mt)\n{\nswitch(mt){\n");
for (minterm = 0; minterm < 256; minterm++) {
printf("case 0x%x:\n", minterm);
printf("\treturn %s;\n", blitops[minterm].s);
}
printf("}\n");
printf("return 0;\n"); /* No, sir, it doesn't! */
printf("}\n");
}
static void generate_func(void)
{
unsigned int i;
printf("#include \"sysconfig.h\"\n");
printf("#include \"sysdeps.h\"\n");
printf("#include \"options.h\"\n");
printf("#include \"include/memory.h\"\n");
printf("#include \"newcpu.h\"\n");
printf("#include \"custom.h\"\n");
printf("#include \"savestate.h\"\n");
printf("#include \"blitter.h\"\n");
printf("#include \"blitfunc.h\"\n\n");
for (i = 0; i < sizeof(blttbl); i++) {
int active = blitops[blttbl[i]].used;
int a_is_on = active & 1, b_is_on = active & 2, c_is_on = active & 4;
printf("void blitdofast_%x (uaecptr pta, uaecptr ptb, uaecptr ptc, uaecptr ptd, struct bltinfo *b)\n",blttbl[i]);
printf("{\n");
printf("int i,j;\n");
printf("uae_u32 totald = 0;\n");
if (b_is_on) printf("uae_u32 srcb = b->bltbhold;\n");
if (c_is_on) printf("uae_u32 srcc = b->bltcdat;\n");
printf("uae_u32 dstd=0;\n");
printf("uaecptr dstp = 0;\n");
printf("for (j = 0; j < b->vblitsize; j++) {\n");
printf("\tfor (i = 0; i < b->hblitsize; i++) {\n\t\tuae_u32 bltadat, srca;\n\n");
if (c_is_on) printf("\t\tif (ptc) { srcc = do_get_mem_word ((uae_u16 *)ptc); ptc += 2; }\n");
if (b_is_on) printf("\t\tif (ptb) {\n\t\t\tuae_u32 bltbdat = b->bltbdat = do_get_mem_word ((uae_u16 *)ptb); ptb += 2;\n");
if (b_is_on) printf("\t\t\tsrcb = (((uae_u32)b->bltbold << 16) | bltbdat) >> b->blitbshift;\n");
if (b_is_on) printf("\t\t\tb->bltbold = bltbdat;\n\t\t}\n");
if (a_is_on) printf("\t\tif (pta) { bltadat = b->bltadat = do_get_mem_word ((uae_u16 *)pta); pta += 2; } else { bltadat = b->bltadat; }\n");
if (a_is_on) printf("\t\tbltadat &= blit_masktable[i];\n");
if (a_is_on) printf("\t\tsrca = (((uae_u32)b->bltaold << 16) | bltadat) >> b->blitashift;\n");
if (a_is_on) printf("\t\tb->bltaold = bltadat;\n");
printf("\t\tif (dstp)\n\t\t\tchipmem_wput_indirect (dstp, dstd);\n");
printf("\t\tdstd = (%s);\n", blitops[blttbl[i]].s);
printf("\t\ttotald |= dstd;\n");
printf("\t\tif (ptd) { dstp = ptd; ptd += 2; }\n");
printf("\t}\n");
if (a_is_on) printf("\tif (pta) pta += b->bltamod;\n");
if (b_is_on) printf("\tif (ptb) ptb += b->bltbmod;\n");
if (c_is_on) printf("\tif (ptc) ptc += b->bltcmod;\n");
printf("\tif (ptd) ptd += b->bltdmod;\n");
printf("}\n");
if (b_is_on) printf("b->bltbhold = srcb;\n");
if (c_is_on) printf("b->bltcdat = srcc;\n");
printf("\t\tif (dstp)\n\t\t\tchipmem_wput_indirect (dstp, dstd);\n");
printf("if ((totald<<16) != 0) b->blitzero = 0;\n");
printf("}\n");
printf("void blitdofast_desc_%x (uaecptr pta, uaecptr ptb, uaecptr ptc, uaecptr ptd, struct bltinfo *b)\n",blttbl[i]);
printf("{\n");
printf("uae_u32 totald = 0;\n");
printf("int i,j;\n");
if (b_is_on) printf("uae_u32 srcb = b->bltbhold;\n");
if (c_is_on) printf("uae_u32 srcc = b->bltcdat;\n");
printf("uae_u32 dstd = 0;\n");
printf("uaecptr dstp = 0;\n");
printf("for (j = 0; j < b->vblitsize; j++) {\n");
printf("\tfor (i = 0; i < b->hblitsize; i++) {\n\t\tuae_u32 bltadat, srca;\n");
if (c_is_on) printf("\t\tif (ptc) { srcc = do_get_mem_word ((uae_u16 *)ptc); ptc -= 2; }\n");
if (b_is_on) printf("\t\tif (ptb) {\n\t\t\tuae_u32 bltbdat = b->bltbdat = do_get_mem_word ((uae_u16 *)ptb); ptb -= 2;\n");
if (b_is_on) printf("\t\t\tsrcb = ((bltbdat << 16) | b->bltbold) >> b->blitdownbshift;\n");
if (b_is_on) printf("\t\t\tb->bltbold = bltbdat;\n\t\t}\n");
if (a_is_on) printf("\t\tif (pta) { bltadat = b->bltadat = do_get_mem_word ((uae_u16 *)pta); pta -= 2; } else { bltadat = b->bltadat; }\n");
if (a_is_on) printf("\t\tbltadat &= blit_masktable[i];\n");
if (a_is_on) printf("\t\tsrca = (((uae_u32)bltadat << 16) | b->bltaold) >> b->blitdownashift;\n");
if (a_is_on) printf("\t\tb->bltaold = bltadat;\n");
printf("\t\tif (dstp)\n\t\t\tchipmem_wput_indirect (dstp, dstd);\n");
printf("\t\tdstd = (%s);\n", blitops[blttbl[i]].s);
printf("\t\ttotald |= dstd;\n");
printf("\t\tif (ptd) { dstp = ptd; ptd -= 2; }\n");
printf("\t}\n");
if (a_is_on) printf("\tif (pta) pta -= b->bltamod;\n");
if (b_is_on) printf("\tif (ptb) ptb -= b->bltbmod;\n");
if (c_is_on) printf("\tif (ptc) ptc -= b->bltcmod;\n");
printf("\tif (ptd) ptd -= b->bltdmod;\n");
printf("}\n");
if (b_is_on) printf("b->bltbhold = srcb;\n");
if (c_is_on) printf("b->bltcdat = srcc;\n");
printf("\t\tif (dstp)\n\t\t\tchipmem_wput_indirect (dstp, dstd);\n");
printf("if ((totald<<16) != 0) b->blitzero = 0;\n");
printf("}\n");
}
}
static void generate_table(void)
{
unsigned int index = 0;
unsigned int i;
printf("#include \"sysconfig.h\"\n");
printf("#include \"sysdeps.h\"\n");
printf("#include \"options.h\"\n");
printf("#include \"include/memory.h\"\n");
printf("#include \"newcpu.h\"\n");
printf("#include \"custom.h\"\n");
printf("#include \"savestate.h\"\n");
printf("#include \"blitter.h\"\n");
printf("#include \"blitfunc.h\"\n\n");
printf("blitter_func * const blitfunc_dofast[256] = {\n");
for (i = 0; i < 256; i++) {
if (index < sizeof(blttbl) && i == blttbl[index]) {
printf("blitdofast_%x",i);
index++;
}
else printf("0");
if (i < 255) printf(", ");
if ((i & 7) == 7) printf("\n");
}
printf("};\n\n");
index = 0;
printf("blitter_func * const blitfunc_dofast_desc[256] = {\n");
for (i = 0; i < 256; i++) {
if (index < sizeof(blttbl) && i == blttbl[index]) {
printf("blitdofast_desc_%x",i);
index++;
}
else printf("0");
if (i < 255) printf(", ");
if ((i & 7) == 7) printf("\n");
}
printf("};\n");
}
static void generate_header(void)
{
unsigned int i;
for (i = 0; i < sizeof(blttbl); i++) {
printf("extern blitter_func blitdofast_%x;\n",blttbl[i]);
printf("extern blitter_func blitdofast_desc_%x;\n",blttbl[i]);
}
}
int main(int argc, char **argv)
{
char mode = 'i';
if (argc == 2) mode = *argv[1];
switch (mode) {
case 'i': generate_include();
break;
case 'f': generate_func();
break;
case 't': generate_table();
break;
case 'h': generate_header();
break;
default: abort();
}
return 0;
}

4242
src/gencpu.cpp
View file

File diff suppressed because it is too large Load diff

605
src/genlinetoscr.cpp
View file

@ -1,605 +0,0 @@
/*
* E-UAE - The portable Amiga Emulator
*
* Generate pixel output code.
*
* (c) 2006 Richard Drummond
*/
#include "sysconfig.h"
#include "sysdeps.h"
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
/* Output for big-endian target if true, little-endian is false. */
int do_bigendian;
typedef int DEPTH_T;
#define DEPTH_8BPP 0
#define DEPTH_16BPP 1
#define DEPTH_32BPP 2
#define DEPTH_MAX DEPTH_32BPP
static const char *get_depth_str (DEPTH_T bpp)
{
if (bpp == DEPTH_8BPP)
return "8";
else if (bpp == DEPTH_16BPP)
return "16";
else
return "32";
}
static const char *get_depth_type_str (DEPTH_T bpp)
{
if (bpp == DEPTH_8BPP)
return "uae_u8";
else if (bpp == DEPTH_16BPP)
return "uae_u16";
else
return "uae_u32";
}
typedef int HMODE_T;
#define HMODE_NORMAL 0
#define HMODE_DOUBLE 1
#define HMODE_DOUBLE2X 2
#define HMODE_HALVE1 3
#define HMODE_HALVE1F 4
#define HMODE_HALVE2 5
#define HMODE_HALVE2F 6
#define HMODE_MAX HMODE_HALVE2F
static const char *get_hmode_str (HMODE_T hmode)
{
if (hmode == HMODE_DOUBLE)
return "_stretch1";
else if (hmode == HMODE_DOUBLE2X)
return "_stretch2";
else if (hmode == HMODE_HALVE1)
return "_shrink1";
else if (hmode == HMODE_HALVE1F)
return "_shrink1f";
else if (hmode == HMODE_HALVE2)
return "_shrink2";
else if (hmode == HMODE_HALVE2F)
return "_shrink2f";
else
return "";
}
typedef enum
{
CMODE_NORMAL,
CMODE_DUALPF,
CMODE_EXTRAHB,
CMODE_HAM
} CMODE_T;
#define CMODE_MAX CMODE_HAM
static FILE *outfile;
static unsigned int outfile_indent = 0;
static void set_outfile (FILE *f)
{
outfile = f;
}
static int set_indent (int indent)
{
int old_indent = outfile_indent;
outfile_indent = indent;
return old_indent;
}
static void outindent(void)
{
unsigned int i;
for (i = 0; i < outfile_indent; i++)
fputc(' ', outfile);
}
static void outf(const char *s, ...)
{
va_list ap;
va_start(ap, s);
vfprintf(outfile, s, ap);
}
static void outln (const char *s)
{
outindent();
fprintf (outfile, "%s\n", s);
}
static void outlnf (const char *s, ...)
{
va_list ap;
outindent();
va_start (ap, s);
vfprintf (outfile, s, ap);
fputc ('\n', outfile);
}
static void out_linetoscr_decl (DEPTH_T bpp, HMODE_T hmode, int aga, int spr, int genlock)
{
outlnf ("static int NOINLINE linetoscr_%s%s%s%s%s(int spix, int dpix, int dpix_end)",
get_depth_str (bpp),
get_hmode_str (hmode), aga ? "_aga" : "", spr > 0 ? "_spr" : (spr < 0 ? "_spronly" : ""), genlock ? "_genlock" : "");
}
static void out_linetoscr_do_srcpix (DEPTH_T bpp, HMODE_T hmode, int aga, CMODE_T cmode, int spr)
{
if (spr < 0) {
outln ( " sprpix_val = 0;");
} else {
if (aga && cmode != CMODE_DUALPF) {
if (spr)
outln ( " sprpix_val = pixdata.apixels[spix];");
if (cmode != CMODE_HAM)
outln ( " spix_val = (pixdata.apixels[spix] ^ xor_val) & and_val;");
} else if (cmode != CMODE_HAM) {
outln ( " spix_val = pixdata.apixels[spix];");
if (spr)
outln ( " sprpix_val = spix_val;");
}
}
}
static void out_linetoscr_do_dstpix (DEPTH_T bpp, HMODE_T hmode, int aga, CMODE_T cmode, int spr)
{
if (spr < 0)
return;
if (aga && cmode == CMODE_HAM) {
outln ( " spix_val = ham_linebuf[spix];");
outln ( " dpix_val = CONVERT_RGB (spix_val);");
} else if (cmode == CMODE_HAM) {
outln ( " spix_val = ham_linebuf[spix];");
outln ( " dpix_val = p_xcolors[spix_val];");
if (spr)
outln ( " sprpix_val = pixdata.apixels[spix];");
} else if (aga && cmode == CMODE_DUALPF) {
outln ( " {");
outln ( " uae_u8 val = lookup[spix_val];");
outln ( " if (lookup_no[spix_val])");
outln ( " val += dblpfofs[bpldualpf2of];");
outln ( " val ^= xor_val;");
outln ( " dpix_val = p_acolors[val];");
outln ( " }");
} else if (cmode == CMODE_DUALPF) {
outln ( " dpix_val = p_acolors[lookup[spix_val]];");
} else if (aga && cmode == CMODE_EXTRAHB) {
outln ( " if (pixdata.apixels[spix] & 0x20) {");
outln ( " unsigned int c = (colors_for_drawing.color_regs_aga[spix_val & 0x1f] >> 1) & 0x7F7F7F;");
outln ( " dpix_val = CONVERT_RGB (c);");
outln ( " } else");
outln ( " dpix_val = p_acolors[spix_val];");
} else if (cmode == CMODE_EXTRAHB) {
outln ( " if (spix_val <= 31)");
outln ( " dpix_val = p_acolors[spix_val];");
outln ( " else");
outln ( " dpix_val = p_xcolors[(colors_for_drawing.color_regs_ecs[spix_val - 32] >> 1) & 0x777];");
} else
outln ( " dpix_val = p_acolors[spix_val];");
}
static void out_linetoscr_do_incspix (DEPTH_T bpp, HMODE_T hmode, int aga, CMODE_T cmode, int spr)
{
if (spr < 0) {
outln(" spix++;");
return;
}
if (hmode == HMODE_HALVE1F) {
outln ( " {");
outln ( " uae_u32 tmp_val;");
outln ( " spix++;");
outln ( " tmp_val = dpix_val;");
out_linetoscr_do_srcpix (bpp, hmode, aga, cmode, spr);
out_linetoscr_do_dstpix (bpp, hmode, aga, cmode, spr);
outlnf ( " dpix_val = merge_2pixel%d (dpix_val, tmp_val);", bpp == 0 ? 8 : bpp == 1 ? 16 : 32);
outln ( " spix++;");
outln ( " }");
} else if (hmode == HMODE_HALVE2F) {
outln ( " {");
outln ( " uae_u32 tmp_val, tmp_val2, tmp_val3;");
outln ( " spix++;");
outln ( " tmp_val = dpix_val;");
out_linetoscr_do_srcpix (bpp, hmode, aga, cmode, spr);
out_linetoscr_do_dstpix (bpp, hmode, aga, cmode, spr);
outln ( " spix++;");
outln ( " tmp_val2 = dpix_val;");
out_linetoscr_do_srcpix (bpp, hmode, aga, cmode, spr);
out_linetoscr_do_dstpix (bpp, hmode, aga, cmode, spr);
outln ( " spix++;");
outln ( " tmp_val3 = dpix_val;");
out_linetoscr_do_srcpix (bpp, hmode, aga, cmode, spr);
out_linetoscr_do_dstpix (bpp, hmode, aga, cmode, spr);
outlnf ( " tmp_val = merge_2pixel%d (tmp_val, tmp_val2);", bpp == 0 ? 8 : bpp == 1 ? 16 : 32);
outlnf ( " tmp_val2 = merge_2pixel%d (tmp_val3, dpix_val);", bpp == 0 ? 8 : bpp == 1 ? 16 : 32);
outlnf ( " dpix_val = merge_2pixel%d (tmp_val, tmp_val2);", bpp == 0 ? 8 : bpp == 1 ? 16 : 32);
outln ( " spix++;");
outln ( " }");
} else if (hmode == HMODE_HALVE1) {
outln ( " spix += 2;");
} else if (hmode == HMODE_HALVE2) {
outln ( " spix += 4;");
} else {
outln ( " spix++;");
}
}
static void put_dpixsprgenlock(int offset, int genlock)
{
if (!genlock)
return;
if (offset)
outlnf(" genlock_buf[dpix + %d] = get_genlock_transparency(sprcol);", offset);
else
outlnf(" genlock_buf[dpix] = get_genlock_transparency(sprcol);");
}
static void put_dpixgenlock(int offset, CMODE_T cmode, int aga, int genlock, const char *var2)
{
if (!genlock)
return;
outindent();
if (offset)
outf(" genlock_buf[dpix + %d] = get_genlock_transparency(", offset);
else
outf(" genlock_buf[dpix] = get_genlock_transparency(");
if (genlock) {
if (cmode == CMODE_EXTRAHB) {
outf("%s", var2 ? var2 : "spix_val & 31");
}
else if (cmode == CMODE_DUALPF) {
outf("%s", var2 ? var2 : "lookup[spix_val]");
}
else if (cmode == CMODE_HAM) {
if (aga) {
outf("%s", var2 ? var2 : "(spix_val >> 2) & 63");
}
else {
outf("%s", var2 ? var2 : "spix_val & 15");
}
}
else {
outf("%s", var2 ? var2 : "spix_val");
}
}
outf(");\n");
}
static void put_dpix (const char *var)
{
outlnf(" buf[dpix++] = %s;", var);
}
static void out_sprite (DEPTH_T bpp, HMODE_T hmode, CMODE_T cmode, int aga, int cnt, int spr, int genlock)
{
if (aga) {
if (cnt == 1) {
outlnf ( " if (spritepixels[dpix].data) {");
outlnf ( " sprcol = render_sprites (dpix + 0, %d, sprpix_val, %d);", cmode == CMODE_DUALPF ? 1 : 0, aga);
outlnf(" if (sprcol) {");
outlnf ( " out_val = p_acolors[sprcol];");
put_dpixsprgenlock(0, genlock);
outlnf(" }");
outlnf(" }");
put_dpix("out_val");
} else if (cnt == 2) {
outlnf ( " {");
outlnf ( " uae_u32 out_val1 = out_val;");
outlnf ( " uae_u32 out_val2 = out_val;");
outlnf(" if (spritepixels[dpix + 0].data) {");
outlnf ( " sprcol = render_sprites (dpix + 0, %d, sprpix_val, %d);", cmode == CMODE_DUALPF ? 1 : 0, aga);
outlnf ( " if (sprcol) {");
outlnf ( " out_val1 = p_acolors[sprcol];");
put_dpixsprgenlock(0, genlock);
outlnf(" }");
outlnf(" }");
outlnf ( " if (spritepixels[dpix + 1].data) {");
outlnf ( " sprcol = render_sprites (dpix + 1, %d, sprpix_val, %d);", cmode == CMODE_DUALPF ? 1 : 0, aga);
outlnf ( " if (sprcol) {");
outlnf ( " out_val2 = p_acolors[sprcol];");
put_dpixsprgenlock(1, genlock);
outlnf(" }");
outlnf(" }");
put_dpix("out_val1");
put_dpix("out_val2");
outlnf ( " }");
} else if (cnt == 4) {
outlnf ( " {");
outlnf ( " uae_u32 out_val1 = out_val;");
outlnf ( " uae_u32 out_val2 = out_val;");
outlnf ( " uae_u32 out_val3 = out_val;");
outlnf ( " uae_u32 out_val4 = out_val;");
outlnf(" if (spritepixels[dpix + 0].data) {");
outlnf ( " sprcol = render_sprites (dpix + 0, %d, sprpix_val, %d);", cmode == CMODE_DUALPF ? 1 : 0, aga);
outlnf ( " if (sprcol) {");
outlnf ( " out_val1 = p_acolors[sprcol];");
put_dpixsprgenlock(0, genlock);
outlnf(" }");
outlnf(" }");
outlnf ( " if (spritepixels[dpix + 1].data) {");
outlnf ( " sprcol = render_sprites (dpix + 1, %d, sprpix_val, %d);", cmode == CMODE_DUALPF ? 1 : 0, aga);
outlnf ( " if (sprcol) {");
outlnf ( " out_val2 = p_acolors[sprcol];");
put_dpixsprgenlock(1, genlock);
outlnf(" }");
outlnf(" }");
outlnf ( " if (spritepixels[dpix + 2].data) {");
outlnf ( " sprcol = render_sprites (dpix + 2, %d, sprpix_val, %d);", cmode == CMODE_DUALPF ? 1 : 0, aga);
outlnf ( " if (sprcol) {");
outlnf ( " out_val3 = p_acolors[sprcol];");
put_dpixsprgenlock(2, genlock);
outlnf(" }");
outlnf(" }");
outlnf ( " if (spritepixels[dpix + 3].data) {");
outlnf ( " sprcol = render_sprites (dpix + 3, %d, sprpix_val, %d);", cmode == CMODE_DUALPF ? 1 : 0, aga);
outlnf ( " if (sprcol) {");
outlnf ( " out_val4 = p_acolors[sprcol];");
put_dpixsprgenlock(3, genlock);
outlnf(" }");
outlnf(" }");
put_dpix("out_val1");
put_dpix("out_val2");
put_dpix("out_val3");
put_dpix("out_val4");
outlnf ( " }");
}
} else {
outlnf ( " if (spritepixels[dpix].data) {");
outlnf ( " sprcol = render_sprites (dpix, %d, sprpix_val, %d);", cmode == CMODE_DUALPF ? 1 : 0, aga);
put_dpixsprgenlock(0, genlock);
outlnf(" if (sprcol) {");
outlnf ( " uae_u32 spcol = p_acolors[sprcol];");
outlnf ( " out_val = spcol;");
outlnf ( " }");
outlnf ( " }");
while (cnt-- > 0)
put_dpix("out_val");
}
}
static void out_linetoscr_mode (DEPTH_T bpp, HMODE_T hmode, int aga, int spr, CMODE_T cmode, int genlock)
{
int old_indent = set_indent (8);
if (aga && cmode == CMODE_DUALPF) {
outln ( "int *lookup = bpldualpfpri ? dblpf_ind2_aga : dblpf_ind1_aga;");
outln ( "int *lookup_no = bpldualpfpri ? dblpf_2nd2 : dblpf_2nd1;");
} else if (cmode == CMODE_DUALPF)
outln ( "int *lookup = bpldualpfpri ? dblpf_ind2 : dblpf_ind1;");
if (bpp == DEPTH_16BPP && hmode != HMODE_DOUBLE && hmode != HMODE_DOUBLE2X && spr == 0) {
outln ( "int rem;");
outln ( "if (((uintptr_t)&buf[dpix]) & 2) {");
outln ( " uae_u32 spix_val;");
outln ( " uae_u32 dpix_val;");
out_linetoscr_do_srcpix (bpp, hmode, aga, cmode, spr);
out_linetoscr_do_dstpix (bpp, hmode, aga, cmode, spr);
out_linetoscr_do_incspix (bpp, hmode, aga, cmode, spr);
put_dpix("dpix_val");
outln ( "}");
outln ( "if (dpix >= dpix_end)");
outln ( " return spix;");
outln ( "rem = (((uintptr_t)&buf[dpix_end]) & 2);");
outln ( "if (rem)");
outln ( " dpix_end--;");
}
outln ( "while (dpix < dpix_end) {");
if (spr)
outln ( " uae_u32 sprpix_val;");
if (spr >= 0) {
outln ( " uae_u32 spix_val;");
outln ( " uae_u32 dpix_val;");
}
outln ( " uae_u32 out_val;");
outln ( "");
out_linetoscr_do_srcpix (bpp, hmode, aga, cmode, spr);
out_linetoscr_do_dstpix (bpp, hmode, aga, cmode, spr);
out_linetoscr_do_incspix (bpp, hmode, aga, cmode, spr);
if (spr >= 0)
outln ( " out_val = dpix_val;");
else
outln ( " out_val = p_acolors[0];");
if (hmode == HMODE_DOUBLE) {
put_dpixgenlock(0, cmode, aga, genlock, NULL);
put_dpixgenlock(1, cmode, aga, genlock, NULL);
} else if (hmode == HMODE_DOUBLE2X) {
put_dpixgenlock(0, cmode, aga, genlock, NULL);
put_dpixgenlock(1, cmode, aga, genlock, NULL);
put_dpixgenlock(2, cmode, aga, genlock, NULL);
put_dpixgenlock(3, cmode, aga, genlock, NULL);
} else {
put_dpixgenlock(0, cmode, aga, genlock, NULL);
}
if (hmode != HMODE_DOUBLE && hmode != HMODE_DOUBLE2X && bpp == DEPTH_16BPP && spr == 0) {
out_linetoscr_do_srcpix (bpp, hmode, aga, cmode, spr);
out_linetoscr_do_dstpix (bpp, hmode, aga, cmode, spr);
out_linetoscr_do_incspix (bpp, hmode, aga, cmode, spr);
if (do_bigendian)
outln ( " out_val = (out_val << 16) | (dpix_val & 0xFFFF);");
else
outln ( " out_val = (out_val & 0xFFFF) | (dpix_val << 16);");
}
if (hmode == HMODE_DOUBLE) {
if (bpp == DEPTH_8BPP) {
outln ( " *((uae_u16 *)&buf[dpix]) = (uae_u16) out_val;");
outln ( " dpix += 2;");
} else if (bpp == DEPTH_16BPP) {
if (spr) {
out_sprite(bpp, hmode, cmode, aga, 2, spr, genlock);
} else {
outln ( " *((uae_u32 *)&buf[dpix]) = out_val;");
outln ( " dpix += 2;");
}
} else {
if (spr) {
out_sprite(bpp, hmode, cmode, aga, 2, spr, genlock);
} else {
put_dpix("out_val");
put_dpix("out_val");
}
}
} else if (hmode == HMODE_DOUBLE2X) {
if (bpp == DEPTH_8BPP) {
outln ( " *((uae_u32 *)&buf[dpix]) = (uae_u32) out_val;");
outln ( " dpix += 4;");
} else if (bpp == DEPTH_16BPP) {
if (spr) {
out_sprite(bpp, hmode, cmode, aga, 4, spr, genlock);
} else {
outln ( " *((uae_u32 *)&buf[dpix]) = out_val;");
outln ( " dpix += 2;");
outln ( " *((uae_u32 *)&buf[dpix]) = out_val;");
outln ( " dpix += 2;");
}
} else {
if (spr) {
out_sprite(bpp, hmode, cmode, aga, 4, spr, genlock);
} else {
put_dpix("out_val");
put_dpix("out_val");
put_dpix("out_val");
put_dpix("out_val");
}
}
} else {
if (bpp == DEPTH_16BPP) {
if (spr) {
out_sprite(bpp, hmode, cmode, aga, 1, spr, genlock);
} else {
outln ( " *((uae_u32 *)&buf[dpix]) = out_val;");
outln ( " dpix += 2;");
}
} else {
if (spr) {
out_sprite(bpp, hmode, cmode, aga, 1, spr, genlock);
} else {
put_dpix("out_val");
}
}
}
outln ( "}");
if (bpp == DEPTH_16BPP && hmode != HMODE_DOUBLE && hmode != HMODE_DOUBLE2X && spr == 0) {
outln ( "if (rem) {");
outln ( " uae_u32 spix_val;");
outln ( " uae_u32 dpix_val;");
out_linetoscr_do_srcpix (bpp, hmode, aga, cmode, spr);
out_linetoscr_do_dstpix (bpp, hmode, aga, cmode, spr);
out_linetoscr_do_incspix (bpp, hmode, aga, cmode, spr);
put_dpix("dpix_val");
outln ( "}");
}
set_indent (old_indent);
return;
}
static void out_linetoscr (DEPTH_T bpp, HMODE_T hmode, int aga, int spr, int genlock)
{
if (aga)
outln ("#ifdef AGA");
out_linetoscr_decl (bpp, hmode, aga, spr, genlock);
outln ( "{");
outlnf ( " %s *buf = (%s *) xlinebuffer;", get_depth_type_str (bpp), get_depth_type_str (bpp));
if (genlock)
outlnf(" uae_u8 *genlock_buf = xlinebuffer_genlock;");
if (spr)
outln ( " uae_u8 sprcol;");
if (aga && spr >= 0) {
outln(" uae_u8 xor_val = bplxor;");
outln(" uae_u8 and_val = bpland;");
}
outln ( "");
if (spr >= 0) {
outln ( " if (bplham) {");
out_linetoscr_mode(bpp, hmode, aga, spr, CMODE_HAM, genlock);
outln ( " } else if (bpldualpf) {");
out_linetoscr_mode(bpp, hmode, aga, spr, CMODE_DUALPF, genlock);
outln ( " } else if (bplehb) {");
out_linetoscr_mode(bpp, hmode, aga, spr, CMODE_EXTRAHB, genlock);
outln ( " } else {");
out_linetoscr_mode(bpp, hmode, aga, spr, CMODE_NORMAL, genlock);
} else {
outln ( " if (1) {");
out_linetoscr_mode(bpp, hmode, aga, spr, CMODE_NORMAL, genlock);
}
outln ( " }\n");
outln ( " return spix;");
outln ( "}");
if (aga)
outln ( "#endif");
outln ( "");
}
int main (int argc, char *argv[])
{
DEPTH_T bpp;
int aga, spr;
HMODE_T hmode;
do_bigendian = 0;
for (int i = 1; i < argc; i++) {
if (argv[i][0] != '-')
continue;
if (argv[i][1] == 'b' && argv[i][2] == '\0')
do_bigendian = 1;
}
set_outfile (stdout);
outln ("/*");
outln (" * UAE - The portable Amiga emulator.");
outln (" *");
outln (" * This file was generated by genlinetoscr. Don't edit.");
outln (" */");
outln ("");
for (bpp = DEPTH_16BPP; bpp <= DEPTH_MAX; bpp++) {
for (aga = 0; aga <= 1 ; aga++) {
if (aga && bpp == DEPTH_8BPP)
continue;
for (spr = -1; spr <= 1; spr++) {
if (!aga && spr < 0)
continue;
for (hmode = HMODE_NORMAL; hmode <= HMODE_MAX; hmode++) {
out_linetoscr(bpp, hmode, aga, spr, 0);
if (spr >= 0)
out_linetoscr(bpp, hmode, aga, spr, 1);
}
}
}
}
return 0;
}

1
src/gfxboard.cpp
View file

@ -7,7 +7,6 @@
*
*/
#include "sysconfig.h"
#include "sysdeps.h"
#include "options.h"

3
src/gfxutil.cpp
View file

@ -6,7 +6,8 @@
* (c) 1996 Bernd Schmidt, Ed Hanway, Samuel Devulder
*/
#include "sysconfig.h"
#include <string.h>
#include "sysdeps.h"
#include "options.h"
#include "custom.h"

11
src/hardfile.cpp
View file

@ -7,17 +7,14 @@
* 2002 Toni Wilen (scsi emulation, 64-bit support)
*/
#include "sysconfig.h"
#include <string.h>
#include <stdbool.h>
#include "sysdeps.h"
#include "threaddep/thread.h"
#include "options.h"
#include "memory.h"
#include "custom.h"
#include "newcpu.h"
#include "disk.h"
#include "autoconf.h"
#include "traps.h"
#include "filesys.h"
#include "execlib.h"
#include "native2amiga.h"
@ -26,8 +23,6 @@
#include "scsi.h"
#include "gayle.h"
#include "execio.h"
#include "zfile.h"
#include "ide.h"
#define HDF_SUPPORT_NSD 1
#define HDF_SUPPORT_TD64 1

6
src/ide.cpp
View file

@ -7,17 +7,15 @@
*/
#define IDE_LOG 0
#include <stdbool.h>
#include <string.h>
#include "sysconfig.h"
#include "sysdeps.h"
#include "options.h"
#include "blkdev.h"
#include "filesys.h"
#include "gui.h"
#include "uae.h"
#include "memory.h"
#include "newcpu.h"
#include "threaddep/thread.h"
#include "savestate.h"
#include "scsi.h"

0
src/blit.h → src/include/blit.h
View file

0
src/blitfunc.h → src/include/blitfunc.h
View file

0
src/cputbl.h → src/include/cputbl.h
View file

20
src/include/genblitter.h
View file

@ -1,20 +0,0 @@
/*
* UAE - The Un*x Amiga Emulator
*
* Optimized blitter minterm function generator
*
* Copyright 1995,1996 Bernd Schmidt
* Copyright 1996 Alessandro Bissacco
*/
#ifndef UAE_GENBLITTER_H
#define UAE_GENBLITTER_H
struct blitop {
const char *s;
int used;
};
extern struct blitop blitops[256];
#endif /* UAE_GENBLITTER_H */

114
src/include/mackbd.h
View file

@ -1,114 +0,0 @@
/*
* UAE - The Un*x Amiga Emulator
*
* Mac keycodes
*
* (c) 1996 Ernesto Corvi
*/
#ifndef UAE_MACKBD_H
#define UAE_MACKBD_H
#define kUpArrowKeyMap 0x7E /* key map offset for up arrow */
#define kDownArrowKeyMap 0x7D /* key map offset for down arrow */
#define kRightArrowKeyMap 0x7C /* key map offset for right arrow */
#define kLeftArrowKeyMap 0x7B /* key map offset for left arrow */
#define kBackSpaceKeyMap 0x33
#define kReturnKeyMap 0x24
#define kEscapeKeyMap 0x35
#define kLBracketKeyMap 0x21
#define kRBracketKeyMap 0x1E
#define kCommaKeyMap 0x2B
#define kSlashKeyMap 0x2C
#define kSemiColonKeyMap 0x29
#define kMinusKeyMap 0x1B
#define kEqualKeyMap 0x18
#define kQuoteKeyMap 0x27
#define k0KeyMap 0x1D
#define k1KeyMap 0x12
#define k2KeyMap 0x13
#define k3KeyMap 0x14
#define k4KeyMap 0x15
#define k5KeyMap 0x17
#define k6KeyMap 0x16
#define k7KeyMap 0x1A
#define k8KeyMap 0x1C
#define k9KeyMap 0x19
#define kAKeyMap 0x00
#define kBKeyMap 0x0B
#define kCKeyMap 0x08
#define kDKeyMap 0x02
#define kEKeyMap 0x0E
#define kFKeyMap 0x03
#define kGKeyMap 0x05
#define kHKeyMap 0x04
#define kIKeyMap 0x22
#define kJKeyMap 0x26
#define kKKeyMap 0x28
#define kLKeyMap 0x25
#define kMKeyMap 0x2E
#define kNKeyMap 0x2D
#define kOKeyMap 0x1F
#define kPKeyMap 0x23
#define kQKeyMap 0x0C
#define kRKeyMap 0x0F
#define kSKeyMap 0x01
#define kTKeyMap 0x11
#define kUKeyMap 0x20
#define kVKeyMap 0x09
#define kWKeyMap 0x0D
#define kXKeyMap 0x07
#define kYKeyMap 0x10
#define kZKeyMap 0x06
#define kPeriodKeyMap 0x2F
#define kCommandKeyMap 0x37
#define kSpaceBarMap 0x31
#define kTabKeyMap 0x30
#define kControlKeyMap 0x3B
#define kOptionKeyMap 0x3A
#define kCapsLockKeyMap 0x39
#define kShiftKeyMap 0x38
#define kPgUpKeyMap 0x74
#define kPgDnKeyMap 0x79
#define kBackSlash 0x2A
#define kF1KeyMap 0x7A
#define kF2KeyMap 0x78
#define kF3KeyMap 0x63
#define kF4KeyMap 0x76
#define kF5KeyMap 0x60
#define kF6KeyMap 0x61
#define kF7KeyMap 0x62
#define kF8KeyMap 0x64
#define kF9KeyMap 0x65
#define kF10KeyMap 0x6D
#define kF11KeyMap 0x67
#define kF12KeyMap 0x6F
#define kShiftRawKey 0x3F
#define kControlRawKey 0x3C
#define kOptionRawKey 0x3D
#define kCapsRawKey 0x3E
#define kCommandRawKey 0x30
#define kUpRawKey 0x79
#define kDownRawKey 0x7A
#define kLeftRawKey 0x7C
#define kRightRawKey 0x7B
#define kSpaceRawKey 0x36
#define kKP0KeyMap 0x52
#define kKP1KeyMap 0x53
#define kKP2KeyMap 0x54
#define kKP3KeyMap 0x55
#define kKP4KeyMap 0x56
#define kKP5KeyMap 0x57
#define kKP6KeyMap 0x58
#define kKP7KeyMap 0x59
#define kKP8KeyMap 0x5B
#define kKP9KeyMap 0x5C
#endif /* UAE_MACKBD_H */

103
src/include/uae/api.h
View file

@ -1,103 +0,0 @@
/*
* Helpers used to export UAE functions for use with other modules
* Copyright (C) 2014 Frode Solheim
*
* Licensed under the terms of the GNU General Public License version 2.
* See the file 'COPYING' for full license text.
*/
#ifndef UAE_API_H
#define UAE_API_H
/* This file is intended to be included by external libraries as well,
* so don't pull in too much UAE-specific stuff. */
#include "uae/attributes.h"
/* Handy define so we can disable C++ name mangling without considering
* whether the source language is C or C++. */
#ifdef __cplusplus
#define UAE_EXTERN_C extern "C"
#else
#define UAE_EXTERN_C
#endif
/* UAE_EXPORT / UAE_IMPORT are mainly intended as helpers for UAEAPI
* defined below. */
#ifdef _WIN32
#define UAE_EXPORT __declspec(dllexport)
#define UAE_IMPORT __declspec(dllimport)
#else
#define UAE_EXPORT __attribute__((visibility("default")))
#define UAE_IMPORT
#endif
/* UAEAPI marks a function for export across library boundaries. You'll
* likely want to use this together with UAECALL. */
#ifdef UAE
#define UAEAPI UAE_EXTERN_C UAE_EXPORT
#else
#define UAEAPI UAE_EXTERN_C UAE_IMPORT
#endif
/* WinUAE (or external libs) might be compiled with fastcall by default,
* so we force all external functions to use cdecl calling convention. */
#define UAECALL uae_cdecl
/* Helpers to make it easy to import functions from plugins. */
#ifdef UAE
#define UAE_DECLARE_IMPORT_FUNCTION(return_type, function_name, ...) \
typedef return_type (UAECALL * function_name ## _function)(__VA_ARGS__); \
extern function_name ## _function function_name;
#define UAE_IMPORT_FUNCTION(handle, function_name) \
{ \
function_name = (function_name ## _function) uae_dlsym( \
handle, #function_name); \
if (function_name) { \
write_log("Imported " #function_name "\n"); \
} else { \
write_log("WARNING: Could not import " #function_name "\n"); \
} \
}
#define UAE_DECLARE_EXPORT_FUNCTION(return_type, function_name, ...) \
typedef return_type (UAECALL * function_name ## _function)(__VA_ARGS__); \
return_type UAECALL function_name(__VA_ARGS__);
#define UAE_EXPORT_FUNCTION(handle, function_name) \
{ \
void *ptr = uae_dlsym(handle, #function_name); \
if (ptr) { \
*((function_name ## _function *) ptr) = function_name; \
write_log("Exported " #function_name "\n"); \
} else { \
write_log("WARNING: Could not export " #function_name "\n"); \
} \
}
#else
#define UAE_DECLARE_IMPORT_FUNCTION(return_type, function_name, ...) \
return_type UAECALL function_name(__VA_ARGS__);
#define UAE_DECLARE_EXPORT_FUNCTION(return_type, function_name, ...) \
typedef return_type (UAECALL * function_name ## _function)(__VA_ARGS__); \
extern function_name ## _function function_name;
#endif
/**
* Used in both UAE and plugin code to define storage for the function
* imported from the other module.
*/
#define UAE_DEFINE_IMPORT_FUNCTION(function_name) \
function_name ## _function function_name = NULL;
#endif /* UAE_API_H */

34
src/include/uae/attributes.h
View file

@ -1,34 +0,0 @@
/*
* Defines useful functions and variable attributes for UAE
* Copyright (C) 2014 Frode Solheim
*
* Licensed under the terms of the GNU General Public License version 2.
* See the file 'COPYING' for full license text.
*/
#ifndef UAE_ATTRIBUTES_H
#define UAE_ATTRIBUTES_H
/* This file is intended to be included by external libraries as well,
* so don't pull in too much UAE-specific stuff. */
#ifdef _WIN32_
#define uae_cdecl __cdecl
#elif defined(__GNUC__) && defined(__i386__)
#define uae_cdecl __attribute__((cdecl))
#else
#define uae_cdecl
#endif
/* This attribute allows (some) compiles to emit warnings when incorrect
* arguments are used with the format string. */
#ifdef __GNUC__
#define UAE_PRINTF_FORMAT(f, a) __attribute__((format(printf, f, a)))
#else
#define UAE_PRINTF_FORMAT(f, a)
#endif
#define UAE_WPRINTF_FORMAT(f, a)
#endif /* UAE_ATTRIBUTES_H */

8
src/include/uae/cdrom.h
View file

@ -1,8 +0,0 @@
#ifndef UAE_CDROM_H
#define UAE_CDROM_H
#include "uae/types.h"
void encode_l2(uae_u8 *p, int address);
#endif /* UAE_CDROM_H */

13
src/include/uae/io.h
View file

@ -1,13 +0,0 @@
#ifndef UAE_IO_H
#define UAE_IO_H
#include "uae/types.h"
#include <stdio.h>
#ifdef WINUAE
#define uae_tfopen _tfopen
#else
FILE *uae_tfopen(const TCHAR *path, const TCHAR *mode);
#endif
#endif /* UAE_IO_H */

32
src/include/uae/vm.h
View file

@ -1,32 +0,0 @@
/*
* Multi-platform virtual memory functions for UAE.
* Copyright (C) 2015 Frode Solheim
*
* Licensed under the terms of the GNU General Public License version 2.
* See the file 'COPYING' for full license text.
*/
#ifndef UAE_VM_H
#define UAE_VM_H
#include "uae/types.h"
#define UAE_VM_WRITE 2
#define UAE_VM_EXECUTE 4
#define UAE_VM_32BIT (1 << 8)
#define UAE_VM_WRITE_WATCH (1 << 9)
#define UAE_VM_ALLOC_FAILED NULL
/* Even though it looks like you can OR together vm protection values,
* do not do this. Not all combinations are supported (on Windows), and only
* a few combinations are implemented. Only use the following predefined
* constants to be safe. */
#define UAE_VM_NO_ACCESS 0
#define UAE_VM_READ 1
#define UAE_VM_READ_WRITE (UAE_VM_READ | UAE_VM_WRITE)
#define UAE_VM_READ_EXECUTE (UAE_VM_READ | UAE_VM_EXECUTE)
#define UAE_VM_READ_WRITE_EXECUTE (UAE_VM_READ | UAE_VM_WRITE | UAE_VM_EXECUTE)
#endif /* UAE_VM_H */

9
src/inputdevice.cpp
View file

@ -15,8 +15,11 @@
* - fully backward compatible with old joystick/mouse configuration
*
*/
#include <string.h>
#include <stdbool.h>
#include <unistd.h>
#include <sys/time.h>
#include "sysconfig.h"
#include "sysdeps.h"
#include "options.h"
@ -33,11 +36,7 @@
#include "ar.h"
#include "gui.h"
#include "savestate.h"
#include "zfile.h"
#include "cia.h"
#include "autoconf.h"
#include "statusline.h"
#include "native2amiga_api.h"
#include "sounddep/sound.h"
#include "disk.h"
#include "amiberry_gfx.h"

0
src/jit/codegen_arm.cpp → src/jit/codegen_arm.cpp.in
View file

4
src/jit/compemu_fpp.cpp
View file

@ -8,14 +8,12 @@
* Modified 2005 Peter Keunecke
*/
#include <math.h>
#include <stdlib.h>
#include "sysconfig.h"
#include "sysdeps.h"
#include "options.h"
#include "memory.h"
#include "custom.h"
#include "newcpu.h"
#include "compemu.h"
#include "flags_arm.h"

0
src/jit/compemu_midfunc_arm.cpp → src/jit/compemu_midfunc_arm.cpp.in
View file

0
src/jit/compemu_midfunc_arm2.cpp → src/jit/compemu_midfunc_arm2.cpp.in
View file

16
src/jit/compemu_support.cpp
View file

@ -28,10 +28,14 @@
* along with ARAnyM; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <sys/mman.h>
#include <unistd.h>
#include <string.h>
#include <time.h>
#include <math.h>
#include "sysconfig.h"
#include "sysdeps.h"
#if defined(JIT)
@ -705,7 +709,7 @@ STATIC_INLINE void reset_data_buffer(void)
STATIC_INLINE void clobber_flags(void);
#if defined(CPU_arm)
#include "codegen_arm.cpp"
#include "codegen_arm.cpp.in"
#endif
#if defined(CPU_i386) || defined(CPU_x86_64)
#include "codegen_x86.cpp"
@ -1294,8 +1298,8 @@ static void fflags_into_flags_internal(void)
#endif
#if defined(CPU_arm)
#include "compemu_midfunc_arm.cpp"
#include "compemu_midfunc_arm2.cpp"
#include "compemu_midfunc_arm.cpp.in"
#include "compemu_midfunc_arm2.cpp.in"
#endif
#if defined(CPU_i386) || defined(CPU_x86_64)

3492
src/jit/gencomp_arm.cpp
View file

File diff suppressed because it is too large Load diff

9
src/keybuf.cpp
View file

@ -11,17 +11,16 @@
*
* Copyright 1995, 1997 Bernd Schmidt
*/
#include "sysconfig.h"
#include "sysdeps.h"
#include <stdbool.h>
#include <string.h>
#include <assert.h>
#include "sysdeps.h"
#include "options.h"
#include "keybuf.h"
#include "keyboard.h"
#include "inputdevice.h"
#include "custom.h"
#include "savestate.h"
static int kpb_first, kpb_last;

0
src/linetoscr.cpp → src/linetoscr.cpp.in
View file

7
src/machdep/support.cpp
View file

@ -1,10 +1,3 @@
#include "config.h"
#include "sysconfig.h"
#include <stdlib.h>
#include <stdarg.h>
#include <signal.h>
#include "sysdeps.h"
#include "options.h"
#include "memory.h"

16
src/main.cpp
View file

@ -6,16 +6,21 @@
* Copyright 1995 Ed Hanway
* Copyright 1995, 1996, 1997 Bernd Schmidt
*/
#include "sysconfig.h"
#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <string.h>
#include "sysdeps.h"
#include <cassert>
#include "options.h"
#include "threaddep/thread.h"
#include "uae.h"
#include "gensound.h"
#include "audio.h"
#include "include/memory.h"
#include "memory.h"
#include "custom.h"
#include "newcpu.h"
#include "disk.h"
@ -28,14 +33,9 @@
#include "picasso96.h"
#include "native2amiga.h"
#include "savestate.h"
#include "filesys.h"
#include "blkdev.h"
#include "gfxboard.h"
#include "devices.h"
#include "jit/compemu.h"
#include <iostream>
#include "amiberry_gfx.h"
#include "SDL.h"
#ifdef USE_SDL2
SDL_Window* sdlWindow;

6
src/memory.cpp
View file

@ -6,7 +6,9 @@
* (c) 1995 Bernd Schmidt
*/
#include "sysconfig.h"
#include <string.h>
#include <stdbool.h>
#include "sysdeps.h"
#include "options.h"
@ -22,9 +24,7 @@
#include "crc32.h"
#include "gui.h"
#include "akiko.h"
#include "threaddep/thread.h"
#include "gayle.h"
#include "gfxboard.h"
#include "audio.h"
#include "devices.h"

6
src/native2amiga.cpp
View file

@ -9,16 +9,10 @@
* and needs thread support.
*/
#include "sysconfig.h"
#include "sysdeps.h"
#include "threaddep/thread.h"
#include "options.h"
#include "include/memory.h"
#include "custom.h"
#include "newcpu.h"
#include "autoconf.h"
#include "traps.h"
#include "native2amiga.h"
smp_comm_pipe native2amiga_pending;

11
src/newcpu.cpp
View file

@ -5,8 +5,12 @@
*
* (c) 1995 Bernd Schmidt
*/
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdbool.h>
#include "sysconfig.h"
#include "sysdeps.h"
#include "options.h"
@ -15,17 +19,12 @@
#include "custom.h"
#include "newcpu.h"
#include "cpummu.h"
#include "cpu_prefetch.h"
#include "autoconf.h"
#include "traps.h"
#include "gui.h"
#include "savestate.h"
#include "blitter.h"
#include "ar.h"
#include "cia.h"
#include "inputdevice.h"
#include "audio.h"
#include "fpp.h"
#include "threaddep/thread.h"
#include "bsdsocket.h"
#include "statusline.h"

5
src/newcpu_common.cpp
View file

@ -1,10 +1,11 @@
#include "sysconfig.h"
#include <stdlib.h>
#include <stdbool.h>
#include "sysdeps.h"
#include "options.h"
#include "memory.h"
#include "newcpu.h"
#include "cpu_prefetch.h"
int movec_illg (int regno)
{

22
src/osdep/amiberry.cpp
View file

@ -4,21 +4,21 @@
* Amiberry interface
*
*/
#include <stdbool.h>
#include <unistd.h>
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
#include <dirent.h>
#include <stdlib.h>
#include <time.h>
#include <signal.h>
#include <algorithm>
#include <iostream>
#include <vector>
#include <cstdlib>
#include <cstdarg>
#include <asm/sigcontext.h>
#include <csignal>
#include <dlfcn.h>
#ifndef ANDROID
#include <execinfo.h>
#endif
#include "sysconfig.h"
#include "sysdeps.h"
#include "config.h"
#include "uae.h"
#include "options.h"
#include "custom.h"
@ -27,11 +27,7 @@
#include "savestate.h"
#include "rommgr.h"
#include "zfile.h"
#include <SDL.h>
#include "amiberry_rp9.h"
#include "machdep/rpt.h"
#include "threaddep/thread.h"
#include "include/memory.h"
#include "keyboard.h"
#include "rtgmodes.h"

12
src/osdep/amiberry_filesys.cpp
View file

@ -1,10 +1,12 @@
#include <sys/timeb.h>
#include <fcntl.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include "sysconfig.h"
#include <dirent.h>
#include <string.h>
#include <fcntl.h>
#include "sysdeps.h"
#include "config.h"
#include "zfile.h"
#include "options.h"

14
src/osdep/amiberry_gfx.cpp
View file

@ -1,22 +1,20 @@
#include "sysconfig.h"
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <stdio.h>
#include "sysdeps.h"
#include "config.h"
#include "uae.h"
#include "options.h"
#include "gui.h"
#include "memory.h"
#include "newcpu.h"
#include "custom.h"
#include "xwin.h"
#include "drawing.h"
#include "inputdevice.h"
#include "savestate.h"
#include "picasso96.h"
#include "amiberry_gfx.h"
#include <png.h>
#include <SDL.h>
#include <cmath>
#ifdef USE_SDL1
#include <SDL_image.h>
#include <SDL_gfxPrimitives.h>

24
src/osdep/amiberry_gui.cpp
View file

@ -1,7 +1,10 @@
#include <algorithm>
#include <iostream>
#include <vector>
#include <sstream>
#include <stdio.h>
#include <strings.h>
#include <string.h>
#include <stdlib.h>
#include <stdarg.h>
#include <stdbool.h>
#ifdef USE_SDL1
#include <guichan.hpp>
#include <guichan/sdl.hpp>
@ -10,7 +13,6 @@
#include <guisan.hpp>
#include <guisan/sdl.hpp>
#endif
#include "sysconfig.h"
#include "sysdeps.h"
#include "uae.h"
#include "options.h"
@ -19,24 +21,12 @@
#include "gui.h"
#include "osdep/gui/SelectorEntry.hpp"
#include "gui/gui_handling.h"
#include "include/memory.h"
#include "rommgr.h"
#include "newcpu.h"
#include "custom.h"
#include "inputdevice.h"
#include "xwin.h"
#include "drawing.h"
#include "sounddep/sound.h"
#include "audio.h"
#include "keybuf.h"
#include "keyboard.h"
#include "disk.h"
#include "savestate.h"
#include "filesys.h"
#include "autoconf.h"
#include "blkdev.h"
#include <SDL.h>
#include "threaddep/thread.h"
#ifdef AMIBERRY
#include <linux/kd.h>

7
src/osdep/amiberry_hardfile.cpp
View file

@ -1,7 +1,10 @@
#include "sysconfig.h"
#include <stdlib.h>
#include <stdio.h>
#include <stdbool.h>
#include <string.h>
#include "sysdeps.h"
#include "threaddep/thread.h"
#include "options.h"
#include "filesys.h"
#include "zfile.h"

11
src/osdep/amiberry_input.cpp
View file

@ -1,15 +1,14 @@
#include "sysconfig.h"
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include "sysdeps.h"
#include "config.h"
#include "options.h"
#include "keyboard.h"
#include "inputdevice.h"
#include <SDL.h>
#include "zfile.h" /// Horace added
#include <fstream> /// Horace added
#include <string> /// Horace added (to remove)
#include <cstdlib> /// Horace added /* atol */
#include <algorithm>
static struct host_input_button default_controller_map;

13
src/osdep/amiberry_mem.cpp
View file

@ -1,19 +1,14 @@
#include "sysconfig.h"
#include <stdlib.h>
#include <stdbool.h>
#include <string.h>
#include "sysdeps.h"
#include "config.h"
#include "uae.h"
#include "options.h"
#include "gui.h"
#include "include/memory.h"
#include "newcpu.h"
#include "custom.h"
#include "autoconf.h"
#include "akiko.h"
#include "ar.h"
#include "uae/mman.h"
#include <sys/mman.h>
#include <SDL.h>
static uae_u32 natmem_size;
uae_u32 max_z3fastmem;

13
src/osdep/amiberry_rp9.cpp
View file

@ -1,22 +1,19 @@
#include "sysconfig.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <string.h>
#include "sysdeps.h"
#include "config.h"
#include "uae.h"
#include "options.h"
#include "gui.h"
#include "disk.h"
#include "fsdb.h"
#include "memory.h"
#include "newcpu.h"
#include "custom.h"
#include "filesys.h"
#include "autoconf.h"
#include "zfile.h"
#include "archivers/zip/unzip.h"
#include <libxml/tree.h>
#include <libxml/parser.h>
#include <vector>
#define RP9_MANIFEST _T("rp9-manifest.xml")
#define MAX_MANIFEST_ENTRY 256

18
src/osdep/amiberry_whdbooter.cpp
View file

@ -4,16 +4,15 @@
* Amiberry interface
*
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <algorithm>
#include <iostream>
#include <vector>
#include <cstdarg>
#include <asm/sigcontext.h>
#include <csignal>
#ifndef ANDROID
#endif
#include "sysconfig.h"
#include "sysdeps.h"
#include "uae.h"
#include "options.h"
@ -31,17 +30,12 @@ extern FILE *debugfile;
#include "fsdb.h"
#include <libxml/tree.h>
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
#include <cstring>
extern void SetLastActiveConfig(const char* filename);
extern char currentDir[MAX_DPATH];
extern char last_loaded_config[MAX_DPATH];
#include <fstream> /// Horace added
#include <string> /// Horace added (to remove)
struct game_options
{

23
src/osdep/bsdsocket_host.cpp
View file

@ -21,16 +21,26 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <stdlib.h>
#include <string.h>
#include <sys/time.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <netdb.h>
#include <signal.h>
#include <unistd.h>
#include <stddef.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include "sysconfig.h"
#include "sysdeps.h"
#include "options.h"
#include "include/memory.h"
#include "newcpu.h"
#include "custom.h"
#include "autoconf.h"
#include "traps.h"
#include "../threaddep/thread.h"
#include "bsdsocket.h"
#include "native2amiga.h"
@ -45,20 +55,15 @@ void bsdsock_fake_int_handler(void)
#else
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/select.h>
#include <sys/ioctl.h>
#ifdef HAVE_SYS_FILIO_H
# include <sys/filio.h>
#endif
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <stddef.h>
#include <netdb.h>
#include <signal.h>
#include <arpa/inet.h>
//#define DEBUG_BSDSOCKET
#ifdef DEBUG_BSDSOCKET

7
src/osdep/cda_play.cpp
View file

@ -1,12 +1,13 @@
#include "sysconfig.h"
#include <stdbool.h>
#include <sys/types.h>
#include <sys/wait.h>
#include "sysdeps.h"
#include "audio.h"
#include "cda_play.h"
#include "sounddep/sound.h"
#include "uae.h"
cda_audio::~cda_audio()
{

2
src/osdep/charset.cpp
View file

@ -1,4 +1,4 @@
#include "sysconfig.h"
#include <ctype.h>
#include "sysdeps.h"
#include <string.h>

7
src/osdep/fsdb_host.cpp
View file

@ -1,12 +1,13 @@
#include "sysconfig.h"
#include <string.h>
#include <sys/time.h>
#include <time.h>
#include "sysdeps.h"
#include "config.h"
#include "fsdb.h"
#include "zfile.h"
#include <sys/types.h>
#include <sys/stat.h>
int dos_errno(void)
{
int e = errno;

12
src/osdep/gui/CreateFilesysHardfile.cpp
View file

@ -1,3 +1,7 @@
#include <stdbool.h>
#include <string.h>
#include <stdio.h>
#ifdef USE_SDL1
#include <guichan.hpp>
#include <guichan/sdl.hpp>
@ -8,22 +12,14 @@
#include <guisan/sdl.hpp>
#include <guisan/sdl/sdltruetypefont.hpp>
#endif
#include <SDL.h>
#include "SelectorEntry.hpp"
#include "UaeRadioButton.hpp"
#include "UaeDropDown.hpp"
#include "UaeCheckBox.hpp"
#include "sysconfig.h"
#include "sysdeps.h"
#include "config.h"
#include "options.h"
#include "include/memory.h"
#include "uae.h"
#include "autoconf.h"
#include "filesys.h"
#include "gui.h"
#include "gui_handling.h"
#include "inputdevice.h"
#include "amiberry_gfx.h"

9
src/osdep/gui/EditFilesysHardfile.cpp
View file

@ -1,3 +1,7 @@
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
#ifdef USE_SDL1
#include <guichan.hpp>
#include <SDL/SDL_ttf.h>
@ -10,19 +14,14 @@
#include <guisan/sdl/sdltruetypefont.hpp>
#endif
#include "SelectorEntry.hpp"
#include "UaeRadioButton.hpp"
#include "UaeDropDown.hpp"
#include "UaeCheckBox.hpp"
#include "sysconfig.h"
#include "sysdeps.h"
#include "config.h"
#include "options.h"
#include "memory.h"
#include "uae.h"
#include "autoconf.h"
#include "filesys.h"
#include "gui.h"
#include "gui_handling.h"
#include "inputdevice.h"

11
src/osdep/gui/EditFilesysVirtual.cpp
View file

@ -1,3 +1,7 @@
#include <stdbool.h>
#include <string.h>
#include <stdio.h>
#ifdef USE_SDL1
#include <guichan.hpp>
#include <SDL/SDL_ttf.h>
@ -10,19 +14,12 @@
#include <guisan/sdl/sdltruetypefont.hpp>
#endif
#include "SelectorEntry.hpp"
#include "UaeRadioButton.hpp"
#include "UaeDropDown.hpp"
#include "UaeCheckBox.hpp"
#include "sysconfig.h"
#include "sysdeps.h"
#include "config.h"
#include "options.h"
#include "memory.h"
#include "uae.h"
#include "autoconf.h"
#include "filesys.h"
#include "gui.h"
#include "gui_handling.h"
#include "inputdevice.h"

9
src/osdep/gui/InGameMessage.cpp
View file

@ -1,3 +1,6 @@
#include <stdbool.h>
#include <stdio.h>
#ifdef USE_SDL1
#include <guichan.hpp>
#include <SDL/SDL_ttf.h>
@ -12,15 +15,9 @@
#endif
#include "SelectorEntry.hpp"
#include "sysconfig.h"
#include "sysdeps.h"
#include "config.h"
#include "options.h"
#include "uae.h"
#include "custom.h"
#include "xwin.h"
#include "drawing.h"
#include "gui.h"
#include "gui_handling.h"
#include "amiberry_gfx.h"
#include "inputdevice.h"

7
src/osdep/gui/Navigation.cpp
View file

@ -1,3 +1,5 @@
#include <stdbool.h>
#ifdef USE_SDL1
#include <guichan.hpp>
#include <SDL/SDL_ttf.h>
@ -8,12 +10,9 @@
#include <guisan/sdl/sdltruetypefont.hpp>
#endif
#include "SelectorEntry.hpp"
#include "UaeRadioButton.hpp"
#include "UaeDropDown.hpp"
#include "sysconfig.h"
#include "sysdeps.h"
#include "config.h"
#include "gui_handling.h"
typedef struct
@ -470,4 +469,4 @@ void PushFakeKey(const SDL_Keycode inKey)
nuevent.type = SDL_KEYUP; // and the key up
gui_input->pushInput(nuevent); // Fire key down
}
#endif
#endif

7
src/osdep/gui/PanelAbout.cpp
View file

@ -11,12 +11,7 @@
#endif
#include "SelectorEntry.hpp"
#include "sysconfig.h"
#include "sysdeps.h"
#include "config.h"
#include "options.h"
#include "uae.h"
#include "gui.h"
#include "gui_handling.h"
static gcn::Label* lblEmulatorVersion;
@ -90,4 +85,4 @@ bool HelpPanelAbout(std::vector<std::string> &helptext)
helptext.emplace_back("Here you can see the version information as well as");
helptext.emplace_back("the people behind the development of this emulator.");
return true;
}
}

6
src/osdep/gui/PanelCPU.cpp
View file

@ -1,3 +1,5 @@
#include <stdbool.h>
#ifdef USE_SDL1
#include <guichan.hpp>
#include <SDL/SDL_ttf.h>
@ -13,14 +15,10 @@
#include "UaeRadioButton.hpp"
#include "UaeCheckBox.hpp"
#include "sysconfig.h"
#include "sysdeps.h"
#include "config.h"
#include "options.h"
#include "include/memory.h"
#include "newcpu.h"
#include "uae.h"
#include "gui.h"
#include "gui_handling.h"
static gcn::Window* grpCPU;

8
src/osdep/gui/PanelChipset.cpp
View file

@ -1,3 +1,5 @@
#include <stdbool.h>
#ifdef USE_SDL1
#include <guichan.hpp>
#include <SDL/SDL_ttf.h>
@ -14,14 +16,8 @@
#include "UaeCheckBox.hpp"
#include "UaeDropDown.hpp"
#include "sysconfig.h"
#include "sysdeps.h"
#include "config.h"
#include "options.h"
#include "uae.h"
#include "gui.h"
#include "include/memory.h"
#include "newcpu.h"
#include "custom.h"
#include "gui_handling.h"

Some files were not shown because too many files have changed in this diff Show more