fork daphne to hypseus

Author: Jeffrey Clark

COPYING

@@ -1,12 +1,25 @@
-# Daphne Fork: the First Ever Multiple Arcade Laserdisc Emulator
+# Hypseus
 
-[Daphne] is a program that "lets one play the original versions of many
-laserdisc arcade games on one's PC".
+Hypseus is a fork of [Matt Ownby's][CUS] [Daphne]. A program that "lets one play
+the original versions of many laserdisc arcade games on one's PC."
+
+Some features that differ from the original:
+
+* Updated MPEG2 decoder
+* Working MPEG2 x86_64 hw accel (SSE2)
+* SDL2 support
+* [cmake] build tool
+* More bugs!
+
+**WIP!!! Overlays have not been implemented with SDL2 yet!**
 
 ## Compile
 
-In addition to a working [gcc] toolchain, [cmake] and [autotools], you will need
-(at minimum): [zlib], [GLEW], [SDL2], [vorbis] and [ogg].
+_Currently there is no documentation for the new build process. Pull requests
+gladly accepted._
+
+Minimum software requirements: [gcc], [cmake], [autotools], [zlib], [SDL2],
+[vorbis] and [ogg].
 
     mkdir build
     cd build
@@ -15,18 +28,45 @@ In addition to a working [gcc] toolchain, [cmake] and [autotools], you will need
 
 ## Support
 
-This is software is for educational purposes only. You may submit
-[issues] or [pull requests] to the [Github page].
+This software intended for educational purposes only. Please submit [issues] or
+[pull requests] directly to the [project].
 
 **DO NOT submit issues or request support from the official Daphne forums!**
 
-## About
+## History
+
+Open development by the original author, [Matt Ownby][CUS], ceased years ago.
 
-Open development by the original author, [Matt Ownby][CUS], was halted years ago.
 My intention for creating this public repository was to clean up the build
-process, and publish to Github to foster collaborative development.
+process, fix bugs, learn, upgrade, and publish to foster collaborative
+development. The name was changed to _Hypseus_ so the original authors of
+[Daphne] would not be burdened with requests for support.
+
+A big thanks goes out to [Matt Ownby][CUS] and the many other developers who
+made their work available for me to learn from. Without them this project
+would not be possible.
+
+## License
+
+**Hypseus**, Multiple Arcade Laserdic Emulator  
+Copyright (C) 2016  [Jeffrey Clark][JAC]
+
+**Daphne**, the First Ever Multiple Arcade Laserdisc Emulator  
+Copyright (C) 1999-2013  [Matt Ownby][CUS]
+
+[![GNU General Public License version 3](http://www.gnu.org/graphics/gplv3-127x51.png)][GNU General Public License]
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the [GNU General Public License] as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    [GNU General Public License] for more details.
 
-[Github page]: https://github.com/zaplabs/daphne
+[project]: https://github.com/zaplabs/daphne
 [issues]: https://github.com/zaplabs/daphne/issues
 [pull requests]: https://github.com/zaplabs/daphne/pulls
 [Daphne]: http://www.daphne-emu.com
@@ -43,3 +83,5 @@ process, and publish to Github to foster collaborative development.
 [vorbis]: https://en.wikipedia.org/wiki/Vorbis
 [cmake]: https://cmake.org
 [autotools]: https://en.wikipedia.org/wiki/GNU_Build_System
+[GNU General Public License]: http://www.gnu.org/licenses/gpl-3.0.en.html
+[JAC]: https://github.com/h0tw1r3

LICENSE

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.9)
 
-project(daphne)
+project(hypseus)
 
 option(BENCHMARK    "Benchmark"  OFF)
 option(DEBUG        "Debug"      OFF)
@@ -22,9 +22,9 @@ string(TOUPPER ${CMAKE_SYSTEM_NAME} TARGET_SYSTEM)
 string(CONCAT TARGET_SYSTEM TARGET_ ${TARGET_SYSTEM})
 string(TOUPPER ${CMAKE_TARGET_ARCHITECTURES} TARGET_ARCH)
 string(CONCAT TARGET_ARCH TARGET_ ${TARGET_ARCH})
-set(daphne_VERSION_MAJOR 1)
-set(daphne_VERSION_MINOR 0)
-set(daphne_VERSION_POINT 13)
+set(hypseus_VERSION_MAJOR 1)
+set(hypseus_VERSION_MINOR 0)
+set(hypseus_VERSION_POINT 13)
 
 configure_file(
     "${PROJECT_SOURCE_DIR}/config.h.in"
@@ -70,6 +70,6 @@ add_dependencies( ldp-out vldp )
 add_dependencies( game vldp )
 add_dependencies( sound vldp )
 
-set(EXECUTABLE_NAME "daphne")
-add_executable( ${EXECUTABLE_NAME} daphne.cpp globals.h )
+set(EXECUTABLE_NAME "hypseus")
+add_executable( ${EXECUTABLE_NAME} hypseus.cpp globals.h )
 target_link_libraries( ${EXECUTABLE_NAME} io timer sound video cpu game ${SDL2_LIBRARY} ${SDL2_TTF_LIBRARIES} )

README.md

@@ -1,7 +1,7 @@
-#define daphne_VERSION_MAJOR    @daphne_VERSION_MAJOR@
-#define daphne_VERSION_MINOR    @daphne_VERSION_MINOR@
-#define daphne_VERSION_POINT    @daphne_VERSION_POINT@
-#define daphne_VERSION          "@daphne_VERSION_MAJOR@.@daphne_VERSION_MINOR@.@daphne_VERSION_POINT@"
+#define hypseus_VERSION_MAJOR    @hypseus_VERSION_MAJOR@
+#define hypseus_VERSION_MINOR    @hypseus_VERSION_MINOR@
+#define hypseus_VERSION_POINT    @hypseus_VERSION_POINT@
+#define hypseus_VERSION          "@hypseus_VERSION_MAJOR@.@hypseus_VERSION_MINOR@.@hypseus_VERSION_POINT@"
 
 #define ${TARGET_SYSTEM}
 #define ${TARGET_ARCH}

src/CMakeLists.txt

@@ -1,5 +1,5 @@
 /*
- * cop.cpp
+ * ____ DAPHNE COPYRIGHT NOTICE ____
  *
  * Copyright (C) 2001 Mark Broadhead
  *

src/DaphneManifest.xml src/HyperseusManifest.xml

@@ -1,5 +1,5 @@
 /*
- * cop.h
+ * ____ DAPHNE COPYRIGHT NOTICE ____
  *
  * Copyright (C) 2001 Mark Broadhead
  *

src/config.h.in

@@ -1,5 +1,5 @@
 /*
- * copintf.cpp
+ * ____ DAPHNE COPYRIGHT NOTICE ____
  *
  * Copyright (C) 2001 Mark Broadhead
  *

src/cpu/cop.cpp

@@ -1,5 +1,5 @@
 /*
- * copintf.h
+ * ____ DAPHNE COPYRIGHT NOTICE ____
  *
  * Copyright (C) 2001 Mark Broadhead
  *

src/cpu/cop.h

@@ -1,5 +1,5 @@
 /*
- * cpu-debug.cpp
+ * ____ DAPHNE COPYRIGHT NOTICE ____
  *
  * Copyright (C) 2001 Matt Ownby
  *
@@ -33,8 +33,7 @@
 #include <ctype.h>
 #include "mamewrap.h"
 #include "../io/conout.h"
-#include "../daphne.h"
-#include "../daphne.h"
+#include "../hypseus.h"
 #include "../game/game.h"
 #include "../ldp-out/ldp.h"
 #include "../ldp-in/ldv1000.h"
@@ -58,8 +57,8 @@ void set_debug_cpu(unsigned int which_cpu)
 	g_which_cpu = which_cpu;
 }
 
-// I called this MAME_Debug so that I could test mame cpu cores with daphne (obviously I can't ship mame cpu cores with
-// daphne due to licensing issues)
+// I called this MAME_Debug so that I could test mame cpu cores with hypseus (obviously I can't ship mame cpu cores with
+// hypseus due to licensing issues)
 void MAME_Debug(void)
 {	
 	// if we are in trace mode OR if we've got our desired breakpoint

src/cpu/copintf.cpp

@@ -1,5 +1,5 @@
 /*
- * cpu-debug.h
+ * ____ DAPHNE COPYRIGHT NOTICE ____
  *
  * Copyright (C) 2001 Matt Ownby
  *

src/cpu/copintf.h

@@ -1,5 +1,5 @@
 /*
- * cpu.cpp
+ * ____ DAPHNE COPYRIGHT NOTICE ____
  *
  * Copyright (C) 2001 Matt Ownby
  *
@@ -33,7 +33,7 @@
 #include "cpu.h"
 #include <stdio.h>	// for stderr
 #include <string.h>	// for memcpy
-#include "../daphne.h"
+#include "../hypseus.h"
 #include "../game/game.h"
 #include "../ldp-out/ldp.h"	// to call pre_think
 #include "../timer/timer.h"
@@ -74,7 +74,7 @@ unsigned int g_uCPUMsBehind = 0;
 //#define CPU_DIAG 1
 
 #ifdef CPU_DIAG
-// how many cpu's cpu diag can support (this has nothing to do with how many cpu's daphne can support)
+// how many cpu's cpu diag can support (this has nothing to do with how many cpu's hypseus can support)
 #define CPU_DIAG_CPUCOUNT 10
 	static unsigned int cd_cycle_count[CPU_DIAG_CPUCOUNT];	// for speed test
 	static unsigned int cd_old_time[CPU_DIAG_CPUCOUNT] = { 0 }; // " " "
@@ -933,7 +933,7 @@ void cpu_generate_irq(Uint8 cpu_id, unsigned int which_irq)
 
 static NES_6502* g_6502 = NULL;
 
-// the glue between daphne and the 6502 core we're using
+// the glue between hypseus and the 6502 core we're using
 void generic_6502_init()
 {
 	g_6502 = new NES_6502();
@@ -1052,7 +1052,7 @@ unsigned int generic_dasm_stub( char *buffer, unsigned pc )
 
 // WARNING : this function appears not to de-allocate anything in g_head's linked list,
 //  so don't use it unless you have verified that g_head has been de-allocated first.
-// (I think it was added for xbox daphne)
+// (I think it was added for xbox hypseus)
 void reset_cpu_globals()
 {
 	g_head = NULL;

src/cpu/cpu-debug.cpp

@@ -1,5 +1,5 @@
 /*
- * cpu.h
+ * ____ DAPHNE COPYRIGHT NOTICE ____
  *
  * Copyright (C) 2001 Matt Ownby
  *
@@ -25,15 +25,15 @@
 
 #include <SDL.h>	// for Uint definitions
 
-enum { CPU_UNDEFINED, CPU_Z80, CPU_X86, CPU_M6809, CPU_M6502, CPU_COP421, CPU_I88, CPU_COUNT };	// cpu's supported by daphne now, leave CPU_COUNT at the end
+enum { CPU_UNDEFINED, CPU_Z80, CPU_X86, CPU_M6809, CPU_M6502, CPU_COP421, CPU_I88, CPU_COUNT };	// cpu's supported by hypseus now, leave CPU_COUNT at the end
 
 #define CPU_MEM_SIZE	0x100000	// 1 meg for I86
 #define MAX_CONTEXT_SIZE	100	/* max # of bytes that a cpu context can have */
 #define MAX_IRQS	4	/* how many IRQs we will support per CPU */
 
 struct cpudef;
 
-// structure that defines parameters for each cpu daphne uses
+// structure that defines parameters for each cpu hypseus uses
 struct cpudef
 {
 	// these may all be modified externally
@@ -80,7 +80,7 @@ struct cpudef
 };
 
 void add_cpu(struct cpudef *);	// add a new cpu
-void del_all_cpus();	// delete all cpus that have been added (for shutting down daphne)
+void del_all_cpus();	// delete all cpus that have been added (for shutting down hypseus)
 void cpu_init();	// initialize one cpu
 void cpu_shutdown();	// shutdown all cpus
 void cpu_execute();

src/cpu/cpu-debug.h

@@ -4,7 +4,7 @@
 // UPDATE : I don't think the old z80 core works anymore, it hasn't been maintained and some new functions (get elapsed cycles) aren't available
 #define USE_M80	1
 
-#include "../daphne.h"
+#include "../hypseus.h"
 #ifdef USE_M80
 #include "../cpu/m80.h"
 #define Z80_GET_AF	m80_get_reg(M80_AF)

src/cpu/cpu.cpp

@@ -1,5 +1,5 @@
 /*
- * m80.cpp
+ * ____ DAPHNE COPYRIGHT NOTICE ____
  *
  * Copyright (C) 2001 Matt Ownby
  *

src/cpu/cpu.h

@@ -1,5 +1,5 @@
 /*
- * m80.h
+ * ____ DAPHNE COPYRIGHT NOTICE ____
  *
  * Copyright (C) 2001,2003 Matt Ownby
  *
@@ -56,7 +56,7 @@ typedef enum
 
 // These definitions mirror those found in mamewrap.h
 // But I don't want to #include mamewrap.h in this file because I don't
-// want all the daphne z80 games to depend on mamewrap.h
+// want all the hypseus z80 games to depend on mamewrap.h
 #define CLEAR_LINE 0
 #define ASSERT_LINE 1
 

src/cpu/generic_z80.h

@@ -1,5 +1,5 @@
 /*
- * m80.cpp
+ * ____ DAPHNE COPYRIGHT NOTICE ____
  *
  * Copyright (C) 2001 Matt Ownby
  *

src/cpu/m80.cpp

@@ -1,5 +1,5 @@
 /*
- * m80_internal.h
+ * ____ DAPHNE COPYRIGHT NOTICE ____
  *
  * Copyright (C) 2001,2003 Matt Ownby
  *
@@ -32,7 +32,7 @@
 // No actual SDL functions are used, so you can redefine your own variables
 // if you choose.
 
-/* if we are integrating with daphne, define this */
+/* if we are integrating with hypseus, define this */
 #define INTEGRATE 1
 
 #ifdef INTEGRATE

src/cpu/m80.h

@@ -1,5 +1,5 @@
 /*
- * m80_internal.h
+ * ____ DAPHNE COPYRIGHT NOTICE ____
  *
  * Copyright (C) 2001,2003 Matt Ownby
  *
@@ -32,7 +32,7 @@
 // No actual SDL functions are used, so you can redefine your own variables
 // if you choose.
 
-/* if we are integrating with daphne, define this */
+/* if we are integrating with hypseus, define this */
 #define INTEGRATE 1
 
 #ifdef INTEGRATE

src/cpu/m80_inline.cpp

@@ -1,5 +1,5 @@
 /*
- * m80tables.h
+ * ____ DAPHNE COPYRIGHT NOTICE ____
  *
  * Copyright (C) 2001 Matt Ownby
  *

src/cpu/m80_internal.h

@@ -35,7 +35,7 @@
 */
 
 /*
-** changes for daphne:
+** changes for hypseus:
 **
 ** commented out the stuff in the memory read/write
 ** functions marked as TODO: following cases are N2A03-specific

src/cpu/m80_internal_inline.h

@@ -17,7 +17,7 @@
 ** Any permitted reproduction of these routines, in whole or in part,
 ** must bear this legend.
 */
-// modified for daphne by Mark Broadhead
+// modified for hypseus by Mark Broadhead
 
 #include "config.h"
 

src/cpu/m80tables.h

@@ -1,5 +1,5 @@
 /*
- * astron.cpp
+ * ____ DAPHNE COPYRIGHT NOTICE ____
  *
  * Copyright (C) 2001-2005 Mark Broadhead
  *

src/cpu/nes6502.cpp

@@ -1,5 +1,5 @@
 /*
- * astron.h
+ * ____ DAPHNE COPYRIGHT NOTICE ____
  *
  * Copyright (C) 2001-2005 Mark Broadhead
  *

src/cpu/nes_6502.cpp

@@ -1,5 +1,5 @@
 /*
- * badlands.cpp
+ * ____ DAPHNE COPYRIGHT NOTICE ____
  *
  * Copyright (C) 2001-2005 Mark Broadhead
  *

src/game/astron.cpp

@@ -1,5 +1,5 @@
 /*
- * badlands.h
+ * ____ DAPHNE COPYRIGHT NOTICE ____
  *
  * Copyright (C) 2001-2005 Mark Broadhead
  *