Merge upstream

Makefile.cfg

@@ -99,7 +99,7 @@ endif
 # You generally shouldn't change this unless you are making forked
 # versions (or test versions)
 # Version numbers must be of the form x.x.x
-VERSION = 2.0.1
+VERSION = 2.0.2
 
 # Define this if you want a standalone, statically linked, no dependency binary
 #STANDALONE_BINARY = 1

README.md

@@ -1,37 +1,34 @@
 
-# dcload-ip 2.0.1
+# dcload-ip 2.0.2
 
-A Dreamcast ethernet loader originally by [Andrew Kieschnick](http://napalm-x.thegypsy.com/andrewk/dc/).
-Updated and overhauled by Moopthehedgehog
+A Dreamcast ethernet loader originally by [Andrew Kieschnick](http://napalm-x.thegypsy.com/andrewk/dc/). This program is part of [KallistiOS](http://gamedev.allusion.net/softprj/kos/).
+
+This **special version** has been updated/overhauled by **Moopthehedgehog** and is maintained by [Mickaël Cardoso](https://sizious.com/) and other contributors. This fork is a most avanced/experimental version over the regular [dcload-ip](https://github.com/kallistios/dcload-ip).
 
 ## Features
 
 * Load  `elf`, `srec`, and `bin`
 * PC I/O (read, write, etc to PC - compatible with original dcload)
 * Exception handler
 * Extremely fast
-* Now works on 100mbit
-* Supports both the **Broadband Adapter** (HIT-0400) and **LAN Adapter** (HIT-0300)
-  in a single binary
-- DHCP support (use an IP address of 0.0.0.0 in `Makefile.cfg` to enable it)
-- NTSC 480i, PAL 576i, and VGA display output modes supported
-- Dumping exceptions over the network if the dcload console is enabled
+* Works on 100mbit
+* Supports both the **Broadband Adapter** (HIT-0400) and **LAN Adapter** (HIT-0300) in a single binary
+* DHCP support (use an IP address of 0.0.0.0 in `Makefile.cfg` to enable it)
+* NTSC 480i, PAL 576i, and VGA display output modes supported
+* Dumping exceptions over the network if the dcload console is enabled
 
 ## Building
 
-1. Edit `Makefile.cfg` for your system and network, and then run `make`.
+You will need a modern toolchain, if you don't have one, you can build/obtain it using the `dc-chain` utility included in KallistiOS.
 
-NOTE: GCC 4.7.x users using the KOS 2.1.0 build environment must ensure
-``USING_KOS_GCC`` is enabled in `Makefile.cfg`. Disabling that flag uses compile
-options meant for a portable copy of GCC 9.2/Binutils 2.33.1 compiled with an
-``sh4-elf-`` prefix, which won't work with the KOS 2.1.0 compiler.
+Edit `Makefile.cfg` for your system and network and then run `make`.
 
 ## Installation
 
-1. PC - run `make install` (installs dc-tool)
+1. PC - run `make install` (installs `dc-tool-ip`, by default in `/opt/toolchains/dc/bin`)
 2. DC
 
- a. `cd make-cd`, edit `Makefile`, insert blank cd-r, run `make`. If
+ a. `cd make-cd`, edit `Makefile`, insert blank CD-R, run `make`. If
    `1st_read.bin` hasn't been built yet, this `Makefile` will build it  
  or  
  b. take `target-src/1st_read/1st_read.bin` and stuff it on a cd yourself
@@ -45,11 +42,13 @@ options meant for a portable copy of GCC 9.2/Binutils 2.33.1 compiled with an
 
 * The correct display is something like:
 
-  `dcload-ip 2.0.1`  <- name/version
-  `Broadband Adapter (HIT-0400)`  <- adapter driver in use  
-  `00:d0:f1:02:ab:dd`  <- dc hardware address  
-  `192.168.1.92`  <- dc ip address  
-  `idle...`  <- status  
+```
+  dcload-ip 2.0.2  <- name/version
+  Broadband Adapter (HIT-0400)  <- adapter driver in use  
+  00:d0:de:ad:be:ef  <- dc hardware address  
+  192.168.1.92  <- dc ip address  
+  idle...  <- status  
+```
 
   The background of the screen will be blue (Broadband Adapter) or green (LAN Adapter).
 
@@ -76,15 +75,14 @@ options meant for a portable copy of GCC 9.2/Binutils 2.33.1 compiled with an
 
 ## KOS GDB-over-dcload
 
-To run a GNU debugger session over the dcload connection:
+To run a GNU Debugger (GDB) session over the dcload connection:
 
-1. Build/obtain an sh-elf targetted GNU debugger
-2. Put a `gdb_init()` call somewhere in the startup area of your
-   KOS-based program
-3. Build your program with the `-g` GCC switch to include debugging info
+1. Build/obtain a sh-elf targetted GNU debugger; you can make one using the `dc-chain` utility included in KallistiOS
+2. Put a `gdb_init()` call somewhere in the startup area of your KOS-based program (usually, the `main()` function is a good candidate as it's the entry point for your program)
+3. Build your program with the `-g` GCC switch to include debugging info (e.g., `kos-cc -g myprog.c`)
 4. Launch your program using `dc-tool -g -x <prog.elf>`
-5. Launch sh-elf-gdb and connect to the dc-tool using `target remote :2159`
-6. Squash bugs
+5. Launch `sh-elf-gdb` and connect to the dc-tool using `target remote :2159` (always this port)
+6. Squash bugs!
 
 ## Maple Passthrough
 
@@ -117,7 +115,7 @@ Newly added is the ability to control Dreamcast/SH7091 performance counters over
 the network. These were a previously hidden aspect of the Dreamcast's CPU, and
 this program uses one of them to keep track of DHCP lease time across loaded
 programs. There are two of them, and they are both 48-bit. See perfctr.h/.c for
-details (they are from https://github.com/Moopthehedgehog/DreamHAL).
+details (they are from [DreamHAL](https://github.com/sega-dreamcast/dreamhal)).
 
 Similarly to the Maple packets, the format of a performance counter control packet
 is as follows:
@@ -130,6 +128,7 @@ typedef struct __attribute__ ((packed)) {
 	unsigned char data[];
 } command_t;
 ```
+
 For anyone making a program to take advantage of this functionality, the packet
 payload data essentially just needs to conform to this struct, and "id" should
 be "PMCR" (without null-termination).
@@ -176,14 +175,14 @@ etc.
 Notes:
 - Remember to disable before leaving dcload-ip to execute a program if dcload's
 counter is needed by that program.
-- See perfctr.h for how to calculate time using the CPU/bus ratio method, in
+- See `perfctr.h` for how to calculate time using the CPU/bus ratio method, in
 addition to the available counter modes (and for loads of other information)
-- PMCR_Init() and PMCR_Enable() will do nothing if the perf counter is already running!
+- `PMCR_Init()` and `PMCR_Enable()` will do nothing if the perf counter is already running!
 
 ## Exception Dumping
 
 Another new feature is the ability to send a full register dump to a host PC
-running dc-tool-ip with the console enabled (i.e. not invoked with the `-n`
+running `dc-tool-ip` with the console enabled (i.e. not invoked with the `-n`
 command line option).
 
 In the event of an exception, dcload will print a full register dump on the
@@ -271,9 +270,9 @@ struct _exception_struct_t {
   On Windows, you may use the `netsh` command which is more reliable (e.g. `netsh
   interface ip add neighbors "Ethernet" 192.168.10.1 AA-BB-CC-DD-EE-FF)`. In that
   case, don't forget to specify an IP address in the Ethernet card of your computer.
-  Please set the Dreamcast's IP in `Makefile.cfg` to be in the range 169.254.xxx.xxx
-  when using this method, as 0.0.0.0 is used by the DHCP protocol for network
-  discovery purposes (actually the entire 0.x.x.x range is).
+  Please set the Dreamcast's IP in `Makefile.cfg` to be in the range `169.254.xxx.xxx`
+  when using this method, as `0.0.0.0` is used by the DHCP protocol for network
+  discovery purposes (actually the entire `0.x.x.x` range is).
 * Tested systems: Debian GNU/Linux 2.2-3.0, Cygwin, MinGW,
 [DreamSDK](https://www.dreamsdk.org), Windows Subsystem for Linux v2 (Debian)
 * Many, many bugs have been squashed and much of the code overhauled
@@ -282,17 +281,21 @@ section for that
 
 ## Credits
 
-* [SiZiOUS](https://www.github.com/SiZiOUS) for maintaining this program
-* rtl8139 code based on code by Dan Potter
+* RTL8139 code based on code by Megan Potter
 * LAN Adapter driver code, originally derived from early KOS, majorly overhauled by Moopthehedgehog
 * DHCP support, exception dumping, perf counters, performance improvements by Moopthehedgehog
-* DHCP retry functionality by darcagn
+* DHCP retry functionality by Eric Fradella (darcagn)
 * There are some various files from `newlib-1.8.2` here
-* `video.s`, `maple.c`, and `maple.h` were written by Marcus Comstedt
-* initial win32 porting and implementation of -t by Florian 'Proff' Schulze
-* win32 bugfix by The Gypsy
-* fixes for cygwin by Florian 'Proff' Schulze
-* rx config bug pointed out by Slant
-* horridly buggy nature of 1.0.1 + 1.0.2 pointed out by Dan Potter
+* Some critical files (`video.s`, `maple.c` and `maple.h`) were written by Marcus Comstedt
+* Initial win32 porting and implementation of `-t` by Florian 'Proff' Schulze
+* Win32 bugfix by The Gypsy
+* Fixes for Cygwin by Florian 'Proff' Schulze
+* Lot of various fixes by Mickaël Cardoso (SiZiOUS)
+* RX config bug pointed out by Slant
+* Horridly buggy nature of 1.0.1 + 1.0.2 pointed out by Megan Potter
 * Fixes for `libbfd` segfaults by Atani
 * Inspiration for `MAPL` packet by Tim Hentenaar
+* Contributions by Harley Laue, Sam Steele, Christian Groessler, Protofall, Thomas Sowell,
+  Luke Benstead, [Matt Phillips](https://github.com/BigEvilCorporation), Andy Barajas,
+  snickerbockers, maddiebaka, Paul Cercueil, Daniel Fairchild
+* Major contributions by KallistiOS team: Lawrence Sebald, Donald Haase, Falco Girgis

host-src/tool/dc-tool.c

@@ -201,6 +201,7 @@ extern char *optarg;
 #endif
 
 int gdb_socket_started = 0;
+char *path = 0;
 #ifdef __MINGW32__
 #define bzero(b, len) (memset((b), '\0', (len)), (void)0)
 /* Winsock SOCKET is defined as an unsigned int, so -1 won't work here */
@@ -216,7 +217,6 @@ int gdb_server_socket = -1;
 int socket_fd = 0;     // For GDB
 int global_socket = 0; // Stores whichever global socket gets used
 unsigned int nochroot = 0;
-char *path = 0;
 #endif
 
 void cleanup(char **fnames) {
@@ -1230,9 +1230,18 @@ int open_gdb_socket(int port) {
         return -1;
     }
 
-    const int enable_reuse_addr = 1;
-    int checkopt = setsockopt(gdb_server_socket, SOL_SOCKET, SO_REUSEADDR, &enable_reuse_addr,
-                              sizeof(enable_reuse_addr));
+  const int enable_reuse_addr = 1;
+
+#ifdef _WIN32
+  /* For Windows this cast is necessary on modern GCC... */  
+  int checkopt = setsockopt(gdb_server_socket, SOL_SOCKET, SO_REUSEADDR, 
+                            (char *) &enable_reuse_addr, sizeof(enable_reuse_addr));
+#else
+  /* ... but maybe it's necessary for other OS as well? */	
+  int checkopt = setsockopt(gdb_server_socket, SOL_SOCKET, SO_REUSEADDR, 
+                            &enable_reuse_addr, sizeof(enable_reuse_addr));
+#endif
+
 #ifdef __MINGW32__
     if(checkopt == SOCKET_ERROR) {
 #else
@@ -1265,7 +1274,7 @@ int open_gdb_socket(int port) {
 }
 
 #ifdef __MINGW32__
-#define AVAILABLE_OPTIONS		"x:u:d:a:s:t:m:i:nlqhrg"
+#define AVAILABLE_OPTIONS		"x:u:d:a:s:t:i:nlqhrg"
 #else
 #define AVAILABLE_OPTIONS		"x:u:d:a:s:t:m:c:i:nlqhrg"
 #endif
@@ -1328,6 +1337,7 @@ int main(int argc, char *argv[]) {
             cleanlist[0] = filename;
             strcpy(filename, optarg);
             break;
+#ifndef __MINGW32__
         case 'm':
             if(path) {
                 fprintf(stderr, "-m and -c options are mutually exclusive, choose one\n");
@@ -1342,7 +1352,6 @@ int main(int argc, char *argv[]) {
             set_mappath(path);
             cleanlist[1] = path;
             break;
-#ifndef __MINGW32__
         case 'c':
             if(path) {
                 fprintf(stderr, "-m and -c options are mutually exclusive, choose one\n");
@@ -1434,13 +1443,15 @@ int main(int argc, char *argv[]) {
     if(console & (command == 'x'))
         printf("Console enabled\n");
 
+#ifndef __MINGW32__
     if(path) {
         if(nochroot) {
             printf("Mapping /pc/ to <%s>\n", path);
         } else {
             printf("Chrooting to <%s>\n", path);
         }
     }
+#endif
 
     if(cdfs_redir & (command == 'x'))
         printf("Cdfs redirection enabled\n");

host-src/tool/syscalls.c

@@ -57,6 +57,10 @@
 #define DIRENT_OFFSET   1337
 #define MAX_PATH_LEN    4096
 
+#ifdef _WIN32
+#define realpath(N,R) _fullpath((R),(N),PATH_MAX)
+#endif
+
 static DIR *opendirs[MAX_OPEN_DIRS];
 static char *mappath = NULL;
 static int mappatlen = -1;

make-cd/Makefile

@@ -1,10 +1,11 @@
 CDRECORD	= wodim dev=0,0,0 speed=8
-DD		= dd
-CP		= cp
+DD			= dd
+CP			= cp
 MKISOFS		= genisoimage
-CAT		= cat
+CAT			= cat
 TOUCH		= touch
 1ST_READ	= ../target-src/1st_read/1st_read.bin
+MAKEIP		= /opt/toolchains/dc/kos/utils/makeip/makeip
 
 all: $(1ST_READ) audio.raw burn-audio data.raw burn-data
 
@@ -21,6 +22,9 @@ burn-audio: audio.raw
 1st_read.bin: $(1ST_READ)
 	$(CP) $(1ST_READ) 1st_read.bin
 
+IP.BIN: ip.txt iplogo.png
+	$(MAKEIP) -l iplogo.png ip.txt IP.BIN 
+
 data.raw: tmp.iso IP.BIN
 	( cat IP.BIN ; dd if=tmp.iso bs=2048 skip=16 ) > data.raw
 

make-cd/ip.txt

@@ -0,0 +1,8 @@
+Device Info   : CD-ROM1/1
+Area Symbols  : JUE
+Peripherals   : E000F10
+Product No    : T0000
+Version       : V2.020
+Boot Filename : 1ST_READ.BIN
+SW Maker Name : andrewk
+Game Title    : dcload-ip