From 20db83cd9367363e23747b05dc76dd15ebc2a36e Mon Sep 17 00:00:00 2001
From: Toad King <toadking@toadking.com>
Date: Mon, 3 Sep 2012 18:05:23 -0400
Subject: [PATCH] (NGC) new dol booter, move app_booter to wii folder

move package folders to wii and ngc respectively
---
 .gitignore                         |   2 +-
 Makefile.ngc                       |  14 +-
 Makefile.ngc.salamander            |  13 +-
 Makefile.wii                       |  10 +-
 Makefile.wii.salamander            |  12 +-
 console/griffin/griffin.c          |   5 +
 console/rarch_console_exec.c       |  76 ++-----
 gx/app_booter/string.c             | 118 -----------
 gx/pkg/icon.png                    | Bin 7421 -> 0 bytes
 gx/pkg/meta.xml                    |  10 -
 ngc/pkg/.empty                     |   0
 ngc/sidestep.c                     | 319 +++++++++++++++++++++++++++++
 ngc/sidestep.h                     |  39 ++++
 ngc/ssaram.c                       | 106 ++++++++++
 ngc/ssaram.h                       |  12 ++
 {gx => wii}/app_booter/Makefile    |  17 +-
 {gx => wii}/app_booter/crt0.s      |   0
 {gx => wii}/app_booter/dolloader.c |   0
 {gx => wii}/app_booter/dolloader.h |   0
 {gx => wii}/app_booter/elf_abi.h   |   0
 {gx => wii}/app_booter/elfloader.c |   0
 {gx => wii}/app_booter/elfloader.h |   0
 {gx => wii}/app_booter/link.ld     |   0
 {gx => wii}/app_booter/main.c      |  10 -
 wii/app_booter/string.c            |  25 +++
 {gx => wii}/app_booter/string.h    |   0
 {gx => wii}/app_booter/sync.c      |   0
 {gx => wii}/app_booter/sync.h      |   0
 28 files changed, 540 insertions(+), 248 deletions(-)
 delete mode 100644 gx/app_booter/string.c
 delete mode 100644 gx/pkg/icon.png
 delete mode 100644 gx/pkg/meta.xml
 create mode 100644 ngc/pkg/.empty
 create mode 100644 ngc/sidestep.c
 create mode 100644 ngc/sidestep.h
 create mode 100644 ngc/ssaram.c
 create mode 100644 ngc/ssaram.h
 rename {gx => wii}/app_booter/Makefile (77%)
 rename {gx => wii}/app_booter/crt0.s (100%)
 rename {gx => wii}/app_booter/dolloader.c (100%)
 rename {gx => wii}/app_booter/dolloader.h (100%)
 rename {gx => wii}/app_booter/elf_abi.h (100%)
 rename {gx => wii}/app_booter/elfloader.c (100%)
 rename {gx => wii}/app_booter/elfloader.h (100%)
 rename {gx => wii}/app_booter/link.ld (100%)
 rename {gx => wii}/app_booter/main.c (81%)
 create mode 100644 wii/app_booter/string.c
 rename {gx => wii}/app_booter/string.h (100%)
 rename {gx => wii}/app_booter/sync.c (100%)
 rename {gx => wii}/app_booter/sync.h (100%)

diff --git a/.gitignore b/.gitignore
index 743e75bed4..2e3d0cea65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,4 @@ Debug
 Release
 ipch
 *.user
-gx/app_booter/app_booter_*.bin
+/wii/app_booter/app_booter.bin
diff --git a/Makefile.ngc b/Makefile.ngc
index 4b49f61c0d..c2fc82a9eb 100644
--- a/Makefile.ngc
+++ b/Makefile.ngc
@@ -37,9 +37,7 @@ CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map -T gx/ld/ogc.ld
 LIBS := -lfat -lretro_ngc -logc
 
-APP_BOOTER_DIR = gx/app_booter
-
-OBJ = console/griffin/griffin.o console/font.binobj console/rzlib/rzlib.o $(APP_BOOTER_DIR)/app_booter_ngc.binobj
+OBJ = console/griffin/griffin.o console/font.binobj console/rzlib/rzlib.o
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
@@ -73,23 +71,19 @@ $(ELF_TARGET): $(OBJ)
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-%.bmpobj: %.bmp
-	$(LD) -r -b binary -o $@ $<
-
 %.binobj: %.bin
 	$(LD) -r -b binary -o $@ $<
 
-$(APP_BOOTER_DIR)/app_booter_ngc.bin:
-	$(MAKE) -C $(APP_BOOTER_DIR) platform=ngc
+%.bmpobj: %.bmp
+	$(LD) -r -b binary -o $@ $<
 
 pkg: all
-	cp -r $(DOL_TARGET) gx/pkg/CORE.dol
+	cp -r $(DOL_TARGET) ngc/pkg/CORE.dol
 
 clean:
 	rm -f $(DOL_TARGET)
 	rm -f $(ELF_TARGET)
 	rm -f $(OBJ)
-	$(MAKE) -C $(APP_BOOTER_DIR) platform=ngc clean
 
 .PHONY: clean
 
diff --git a/Makefile.ngc.salamander b/Makefile.ngc.salamander
index bcb08ce76c..28c7334a48 100644
--- a/Makefile.ngc.salamander
+++ b/Makefile.ngc.salamander
@@ -37,9 +37,7 @@ CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map
 LIBS := -lfat -logc
 
-APP_BOOTER_DIR = gx/app_booter
-
-OBJ = gx/salamander/main.o console/rarch_console_exec.o console/rarch_console_libretro_mgmt.o file_path.o compat/compat.o conf/config_file.o $(APP_BOOTER_DIR)/app_booter_ngc.binobj
+OBJ = gx/salamander/main.o console/rarch_console_exec.o console/rarch_console_libretro_mgmt.o file_path.o compat/compat.o conf/config_file.o ngc/ssaram.o ngc/sidestep.o
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
@@ -73,20 +71,13 @@ $(ELF_TARGET): $(OBJ)
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-%.binobj: %.bin
-	$(LD) -r -b binary -o $@ $<
-
-$(APP_BOOTER_DIR)/app_booter_ngc.bin:
-	$(MAKE) -C $(APP_BOOTER_DIR) platform=ngc
-
 pkg: all
-	cp -r $(DOL_TARGET) gx/pkg/boot.dol
+	cp -r $(DOL_TARGET) ngc/pkg/boot.dol
 
 clean:
 	rm -f $(DOL_TARGET)
 	rm -f $(ELF_TARGET)
 	rm -f $(OBJ)
-	$(MAKE) -C $(APP_BOOTER_DIR) platform=ngc clean
 
 .PHONY: clean
 
diff --git a/Makefile.wii b/Makefile.wii
index c2b6ab354c..dd666d3705 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -37,9 +37,9 @@ CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,strdup,-wrap,strndup,-wrap,malloc_usable_size -T gx/ld/rvl.ld
 LIBS := -lfat -lretro_wii -lwiiuse -logc -lbte
 
-APP_BOOTER_DIR = gx/app_booter
+APP_BOOTER_DIR = wii/app_booter
 
-OBJ = console/griffin/griffin.o console/font.binobj console/rzlib/rzlib.o $(APP_BOOTER_DIR)/app_booter_wii.binobj
+OBJ = console/griffin/griffin.o console/font.binobj console/rzlib/rzlib.o $(APP_BOOTER_DIR)/app_booter.binobj
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
@@ -78,8 +78,8 @@ $(ELF_TARGET): $(OBJ)
 %.binobj: %.bin
 	$(LD) -r -b binary -o $@ $<
 
-$(APP_BOOTER_DIR)/app_booter_wii.bin:
-	$(MAKE) -C $(APP_BOOTER_DIR) platform=wii
+$(APP_BOOTER_DIR)/app_booter.bin:
+	$(MAKE) -C $(APP_BOOTER_DIR)
 
 pkg: all
 	cp -r $(DOL_TARGET) wii/pkg/CORE.dol
@@ -88,7 +88,7 @@ clean:
 	rm -f $(DOL_TARGET)
 	rm -f $(ELF_TARGET)
 	rm -f $(OBJ)
-	$(MAKE) -C $(APP_BOOTER_DIR) platform=wii clean
+	$(MAKE) -C $(APP_BOOTER_DIR) clean
 
 .PHONY: clean
 
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index f746807f78..f74437d552 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -37,9 +37,9 @@ CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map
 LIBS := -lfat -lwiiuse -logc -lbte
 
-APP_BOOTER_DIR = gx/app_booter
+APP_BOOTER_DIR = wii/app_booter
 
-OBJ = gx/salamander/main.o console/rarch_console_exec.o console/rarch_console_libretro_mgmt.o file_path.o compat/compat.o conf/config_file.o $(APP_BOOTER_DIR)/app_booter_wii.binobj
+OBJ = gx/salamander/main.o console/rarch_console_exec.o console/rarch_console_libretro_mgmt.o file_path.o compat/compat.o conf/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
@@ -75,17 +75,17 @@ $(ELF_TARGET): $(OBJ)
 %.binobj: %.bin
 	$(LD) -r -b binary -o $@ $<
 
-$(APP_BOOTER_DIR)/app_booter_wii.bin:
-	$(MAKE) -C $(APP_BOOTER_DIR) platform=wii
+$(APP_BOOTER_DIR)/app_booter.bin:
+	$(MAKE) -C $(APP_BOOTER_DIR)
 
 pkg: all
-	cp -r $(DOL_TARGET) gx/pkg/boot.dol
+	cp -r $(DOL_TARGET) wii/pkg/boot.dol
 
 clean:
 	rm -f $(DOL_TARGET)
 	rm -f $(ELF_TARGET)
 	rm -f $(OBJ)
-	$(MAKE) -C $(APP_BOOTER_DIR) platform=wii clean
+	$(MAKE) -C $(APP_BOOTER_DIR) clean
 
 .PHONY: clean
 
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index 8d33094438..fdd512be03 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -32,6 +32,11 @@ CONSOLE EXTENSIONS
 #include "../rarch_console_main_wrap.c"
 #endif
 
+#ifdef HW_DOL
+#include "../../ngc/ssaram.c"
+#include "../../ngc/sidestep.c"
+#endif
+
 #ifdef HAVE_RARCH_EXEC
 #include "../rarch_console_exec.c"
 #endif
diff --git a/console/rarch_console_exec.c b/console/rarch_console_exec.c
index d599c56b86..cbf2003571 100644
--- a/console/rarch_console_exec.c
+++ b/console/rarch_console_exec.c
@@ -25,52 +25,32 @@
 #include <np/drm.h>
 #elif defined(_XBOX)
 #include <xtl.h>
-#elif defined(GEKKO)
+#elif defined(HW_RVL)
 #include <string.h>
 #include <fat.h>
 #include <gctypes.h>
 #include <ogc/cache.h>
 #include <ogc/lwp_threads.h>
 #include <ogc/system.h>
-
-#ifdef HW_RVL
 #include <ogc/usbstorage.h>
 #include <sdcard/wiisd_io.h>
-#else
-#include <ogc/aram.h>
-#endif
-
-#endif
-
-#include "rarch_console_exec.h"
-#include "../retroarch_logger.h"
-
-#ifdef GEKKO
-
-#ifdef HW_RVL
 
 #define EXECUTE_ADDR ((uint8_t *) 0x91800000)
 #define BOOTER_ADDR ((uint8_t *) 0x93000000)
 #define ARGS_ADDR ((uint8_t *) 0x93200000)
 
-extern uint8_t _binary_gx_app_booter_app_booter_wii_bin_start[];
-extern uint8_t _binary_gx_app_booter_app_booter_wii_bin_end[];
-#define booter_start _binary_gx_app_booter_app_booter_wii_bin_start
-#define booter_end _binary_gx_app_booter_app_booter_wii_bin_end
-
-#else
-
-#define ARAMSTART 0x8000
-#define BOOTER_ADDR ((uint8_t *) 0x81300000)
-extern void __exception_closeall(void);
-
-extern uint8_t _binary_gx_app_booter_app_booter_ngc_bin_start[];
-extern uint8_t _binary_gx_app_booter_app_booter_ngc_bin_end[];
-#define booter_start _binary_gx_app_booter_app_booter_ngc_bin_start
-#define booter_end _binary_gx_app_booter_app_booter_ngc_bin_end
+extern uint8_t _binary_wii_app_booter_app_booter_bin_start[];
+extern uint8_t _binary_wii_app_booter_app_booter_bin_end[];
+#define booter_start _binary_wii_app_booter_app_booter_bin_start
+#define booter_end _binary_wii_app_booter_app_booter_bin_end
 
+#elif defined(HW_DOL)
+#include "../ngc/sidestep.h"
 #endif
 
+#include "rarch_console_exec.h"
+#include "../retroarch_logger.h"
+
 #ifdef HW_RVL
 // NOTE: this does not update the path to point to the new loading .dol file.
 // we only need it for keeping the current directory anyway.
@@ -89,7 +69,6 @@ void dol_copy_argv_path(void)
    DCFlushRange(ARGS_ADDR, sizeof(struct __argv) + argv->length);
 }
 #endif
-#endif
 
 void rarch_console_exec(const char *path)
 {
@@ -124,7 +103,7 @@ void rarch_console_exec(const char *path)
    sys_net_finalize_network();
    cellSysmoduleUnloadModule(CELL_SYSMODULE_SYSUTIL_NP);
    cellSysmoduleUnloadModule(CELL_SYSMODULE_NET);
-#elif defined(GEKKO)
+#elif defined(HW_RVL)
    FILE * fp = fopen(path, "rb");
    if (fp == NULL)
    {
@@ -132,60 +111,31 @@ void rarch_console_exec(const char *path)
       return;
    }
 
-#ifdef HW_RVL
    fseek(fp, 0, SEEK_END);
    size_t size = ftell(fp);
    fseek(fp, 0, SEEK_SET);
    fread(EXECUTE_ADDR, 1, size, fp);
    fclose(fp);
    DCFlushRange(EXECUTE_ADDR, size);
-#else
-   uint8_t buffer[0x800];
-   size_t size;
-   size_t offset = 0;
 
-   AR_Reset();
-   AR_Init(NULL, 0);
-   while ((size = fread(buffer, 1, sizeof(buffer), fp)) != 0)
-   {
-      if (size != sizeof(buffer))
-         memset(&buffer[size], 0, sizeof(buffer) - size);
-
-      AR_StartDMA(AR_MRAMTOARAM, (u32) buffer, (u32) offset + ARAMSTART, sizeof(buffer));
-      while (AR_GetDMAStatus());
-      offset += sizeof(buffer);
-   }
-#endif
-
-#ifdef HW_RVL
    dol_copy_argv_path();
-#endif
 
    fatUnmount("carda:");
    fatUnmount("cardb:");
-#ifdef HW_RVL
    fatUnmount("sd:");
    fatUnmount("usb:");
    __io_wiisd.shutdown();
    __io_usbstorage.shutdown();
-#endif
 
    size_t booter_size = booter_end - booter_start;
    memcpy(BOOTER_ADDR, booter_start, booter_size);
    DCFlushRange(BOOTER_ADDR, booter_size);
 
    RARCH_LOG("jumping to %08x\n", (unsigned) BOOTER_ADDR);
-#ifdef HW_RVL
    SYS_ResetSystem(SYS_SHUTDOWN,0,0);
-#else // we need to keep the ARAM alive for the booter app.
-   int level;
-   _CPU_ISR_Disable(level);
-   __exception_closeall();
-#endif
    __lwp_thread_stopmultitasking((void (*)(void)) BOOTER_ADDR);
-#ifdef HW_DOL
-   _CPU_ISR_Restore(level);
-#endif
+#elif defined(HW_DOL)
+   DOLtoARAM(path);
 #else
    RARCH_WARN("External loading of executables is not supported for this platform.\n");
 #endif
diff --git a/gx/app_booter/string.c b/gx/app_booter/string.c
deleted file mode 100644
index 30109578ef..0000000000
--- a/gx/app_booter/string.c
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2008-2009  Segher Boessenkool  <segher@kernel.crashing.org>
-// This code is licensed to you under the terms of the GNU GPL, version 2;
-// see file COPYING or http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
-
-#include <stdio.h>
-
-#ifdef HW_DOL
-#include <gctypes.h>
-#include <ogc/machine/processor.h>
-
-#define DSPCR_DSPDMA        0x0200        // ARAM dma in progress, if set
-#define DSPCR_DSPINT        0x0080        // * interrupt active (RWC)
-#define DSPCR_ARINT         0x0020
-#define DSPCR_AIINT         0x0008
-
-#define ARAMSTART 0x8000
-
-#define _SHIFTR(v, s, w) \
-    ((u32)(((u32)(v) >> (s)) & ((0x01 << (w)) - 1)))
-
-static uint8_t buffer[0x800];
-
-static vu16* const _dspReg = (u16*) 0xCC005000;
-static __inline__ void __ARClearInterrupt()
-{
-   u16 cause;
-
-   cause = _dspReg[5]&~(DSPCR_DSPINT|DSPCR_AIINT);
-   _dspReg[5] = (cause|DSPCR_ARINT);
-}
-
-static __inline__ void __ARWaitDma()
-{
-   while(_dspReg[5]&DSPCR_DSPDMA);
-}
-
-static void __ARReadDMA(u32 memaddr,u32 aramaddr,u32 len)
-{
-   int level;
-   _CPU_ISR_Disable(level);
-   // set main memory address
-   _dspReg[16] = (_dspReg[16]&~0x03ff)|_SHIFTR(memaddr,16,16);
-   _dspReg[17] = (_dspReg[17]&~0xffe0)|_SHIFTR(memaddr, 0,16);
-
-   // set aram address
-   _dspReg[18] = (_dspReg[18]&~0x03ff)|_SHIFTR(aramaddr,16,16);
-   _dspReg[19] = (_dspReg[19]&~0xffe0)|_SHIFTR(aramaddr, 0,16);
-
-   // set cntrl bits
-   _dspReg[20] = (_dspReg[20]&~0x8000)|0x8000;
-   _dspReg[20] = (_dspReg[20]&~0x03ff)|_SHIFTR(len,16,16);
-   _dspReg[21] = (_dspReg[21]&~0xffe0)|_SHIFTR(len, 0,16);
-
-   __ARWaitDma();
-   __ARClearInterrupt();
-   _CPU_ISR_Restore(level);
-}
-#endif
-
-void *memset(void *b, int c, size_t len)
-{
-   size_t i;
-
-   for (i = 0; i < len; i++)
-      ((unsigned char *)b)[i] = c;
-
-   return b;
-}
-
-void *memcpy(void *dst, const void *src, size_t len)
-{
-#ifdef HW_DOL
-   if (((unsigned) src & 0x80000000) == 0)
-   {
-      size_t i;
-      u32 _dst = (u32) dst, _src = (u32) src;
-
-      if ((_src & 0x1F) != 0)
-      {
-         unsigned templen = 32 - (_src & 0x1F);
-         unsigned offset = 32 - templen;
-         __ARReadDMA((u32) buffer, (u32) (_src & ~0x1F) + ARAMSTART, 32);
-         memcpy((void *) _dst, &buffer[offset], templen > len ? len : templen);
-         _src += templen;
-         _dst += templen;
-         if (templen >= len)
-            return (void *) _dst;
-         len -= templen;
-      }
-
-      size_t blocks = len >> 11;
-      for (i = 0; i < blocks; i++)
-      {
-         __ARReadDMA(_dst, _src + ARAMSTART, sizeof(buffer));
-         _src += sizeof(buffer);
-         _dst += sizeof(buffer);
-         len -= sizeof(buffer);
-      }
-
-      if (len)
-      {
-         __ARReadDMA((u32) buffer, _src + ARAMSTART, sizeof(buffer));
-         memcpy((void *) _dst, buffer, len);
-      }
-
-      return (void *) _dst;
-   }
-   else
-#endif
-   {
-      size_t i;
-
-      for (i = 0; i < len; i++)
-         ((unsigned char *)dst)[i] = ((unsigned char *)src)[i];
-
-      return dst;
-   }
-}
diff --git a/gx/pkg/icon.png b/gx/pkg/icon.png
deleted file mode 100644
index 23d1a0762edcb301d9f6765e836ba495783e9970..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7421
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

diff --git a/gx/pkg/meta.xml b/gx/pkg/meta.xml
deleted file mode 100644
index 0d4b53ce65..0000000000
--- a/gx/pkg/meta.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<app version="1">
-  <name>RetroArch GX</name>
-  <coder>Maister, Squarepusher, ToadKing</coder>
-  <version>0.9.7.1</version>
-  <release_date>2012</release_date>
-  <short_description>Multi-system emulator</short_description> 
-  <long_description>A port of RetroArch to the GameCube/Wii.</long_description> 
-  <no_ios_reload/>
-</app>
diff --git a/ngc/pkg/.empty b/ngc/pkg/.empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ngc/sidestep.c b/ngc/sidestep.c
new file mode 100644
index 0000000000..cd13f58afa
--- /dev/null
+++ b/ngc/sidestep.c
@@ -0,0 +1,319 @@
+/** This code is licensed to you under the terms of the GNU GPL, version 2;
+    see file COPYING or http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt */
+
+/****************************************************************************
+* SideStep DOL Loading
+*
+* This module runs a DOL file from Auxilliary RAM. This removes any memory
+* issues which might occur - and also means you can easily overwrite yourself!
+*
+* softdev March 2007
+***************************************************************************/
+#ifndef HW_RVL
+#include <gccore.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <malloc.h>
+#include <network.h>
+#include <smb.h>
+
+#include "sidestep.h"
+#include "ssaram.h"
+
+#define ARAMSTART 0x8000
+
+/*** A global or two ***/
+static DOLHEADER *dolhdr;
+static u32 minaddress = 0;
+static u32 maxaddress = 0;
+static char dol_readbuf[2048];
+
+typedef int (*BOOTSTUB) (u32 entrypoint, u32 dst, u32 src, int len, u32 invlen, u32 invaddress);
+
+/*--- Auxilliary RAM Support ----------------------------------------------*/
+/****************************************************************************
+* ARAMStub
+*
+* This is an assembly routine and should only be called through ARAMRun
+* *DO NOT CALL DIRECTLY!*
+****************************************************************************/
+static void ARAMStub(void)
+{
+	/*** The routine expects to receive
+             R3 = entrypoint
+             R4 = Destination in main RAM
+             R5 = Source from ARAM
+             R6 = Data length
+             R7 = Invalidate Length / 32
+             R8 = Invalidate Start Address
+        ***/
+
+    asm("mtctr 7");
+    asm("Invalidate:");
+    asm("dcbi 0,8");
+    asm("addi 8,8,32");
+    asm("bdnz Invalidate");
+
+    asm("lis 8,0xcc00");
+    asm("ori 8,8,0x3004");
+    asm("lis 7,0");
+    asm("stw 7,0(8)");
+
+    asm("mfmsr 8");
+    asm("ori 8,8,2");
+    asm("rlwinm 8,8,0,17,15");
+    asm("mtmsr 8");
+
+    asm("lis  7,0xcc00");
+    asm("ori 7,7,0x5020");
+    asm("stw 4,0(7)");		/*** Store Memory Address ***/
+    asm("stw 5,4(7)");		/*** Store ARAM Address ***/
+    asm("stw 6,8(7)");		/*** Store Length ***/
+
+    asm("lis  7,0xcc00");
+    asm("ori 7,7,0x500a");
+    asm("WaitDMA:");
+    asm("lhz 5,0(7)");
+    asm("andi. 5,5,0x200");
+    asm("cmpwi 5,5,0");
+    asm("bne WaitDMA");		/*** Wait DMA Complete ***/
+
+    /*** Update exceptions ***/
+    asm("lis 8,0x8000");
+    asm("lis 5,0x4c00");
+    asm("ori 5,5,0x64");
+    asm("stw 5,0x100(8)");
+    asm("stw 5,0x200(8)");
+    asm("stw 5,0x300(8)");
+    asm("stw 5,0x400(8)");
+    asm("stw 5,0x500(8)");
+    asm("stw 5,0x600(8)");
+    asm("stw 5,0x700(8)");
+    asm("stw 5,0x800(8)");
+    asm("stw 5,0x900(8)");
+    asm("stw 5,0xC00(8)");
+    asm("stw 5,0xD00(8)");
+    asm("stw 5,0xF00(8)");
+    asm("stw 5,0x1300(8)");
+    asm("stw 5,0x1400(8)");
+    asm("stw 5,0x1700(8)");
+
+    /*** Flush it all again ***/
+    asm("lis 7,0x30");
+    asm("lis 8,0x8000");
+    asm("mtctr 7");
+    asm("flush:");
+    asm("dcbst 0,8");
+    asm("sync");
+    asm("icbi 0,8");
+    asm("addi 8,8,8");
+    asm("bdnz flush");
+    asm("isync");
+
+    /*** Fix ints ***/
+    asm("mfmsr 8");
+    asm("rlwinm 8,8,0,17,15");
+    asm("mtmsr 8");
+
+    asm("mfmsr 8");
+    asm("ori 8,8,8194");
+    asm("mtmsr 8");
+
+    /*** Party! ***/
+    asm("mtlr 3");
+    asm("blr");			/*** Boot DOL ***/
+
+}
+
+/****************************************************************************
+* ARAMRun
+*
+* This actually runs the new DOL ... eventually ;)
+****************************************************************************/
+void ARAMRun(u32 entrypoint, u32 dst, u32 src, u32 len)
+{
+  char *p;
+  char *s = (char *) ARAMStub;
+  BOOTSTUB stub;
+
+  /*** Shutdown libOGC ***/
+  SYS_ResetSystem(SYS_SHUTDOWN, 0, 0);
+
+  /*** Copy ARAMStub to 81300000 ***/
+  if (dst + len < 0x81300000) p = (void *) 0x81300000;
+  else p = (void *) 0x80003100;
+  memcpy(p, s, 256); /*** Way too much - but who cares ***/
+
+  /*** Round length to 32 bytes ***/
+  if (len & 0x1f) len = (len & ~0x1f) + 0x20;
+ 
+  /*** Flush everything! ***/
+  DCFlushRange((void *) 0x80000000, 0x1800000);
+
+  /*** Boot the bugger :D ***/
+  stub = (BOOTSTUB) p;
+  stub((u32) entrypoint, dst, src, len | 0x80000000, len >> 5, dst);
+}
+
+/****************************************************************************
+* ARAMClear
+*
+* To make life easy, just clear out the Auxilliary RAM completely.
+****************************************************************************/
+static void ARAMClear(void)
+{
+  int i;
+  char *buffer = memalign(32, 2048); /*** A little 2k buffer ***/
+
+  memset(buffer, 0, 2048);
+  DCFlushRange(buffer, 2048);
+
+  for (i = ARAMSTART; i < 0x1000000; i += 2048)
+  {
+    ARAMPut(buffer, (char *) i, 2048);
+    while (AR_GetDMAStatus());
+  }
+
+  free(buffer);
+}
+
+/*--- DOL Decoding functions -----------------------------------------------*/
+/****************************************************************************
+* DOLMinMax
+*
+* Calculate the DOL minimum and maximum memory addresses
+****************************************************************************/
+static void DOLMinMax(DOLHEADER * dol)
+{
+  int i;
+
+  maxaddress = 0;
+  minaddress = 0x87100000;
+
+  /*** Go through DOL sections ***/
+  /*** Text sections ***/
+  for (i = 0; i < MAXTEXTSECTION; i++)
+  {
+    if (dol->textAddress[i] && dol->textLength[i])
+    {
+      if (dol->textAddress[i] < minaddress)
+        minaddress = dol->textAddress[i];
+      if ((dol->textAddress[i] + dol->textLength[i]) > maxaddress) 
+        maxaddress = dol->textAddress[i] + dol->textLength[i];
+    }
+  }
+
+  /*** Data sections ***/
+  for (i = 0; i < MAXDATASECTION; i++)
+  {
+    if (dol->dataAddress[i] && dol->dataLength[i])
+    {
+      if (dol->dataAddress[i] < minaddress)
+        minaddress = dol->dataAddress[i];
+      if ((dol->dataAddress[i] + dol->dataLength[i]) > maxaddress)
+        maxaddress = dol->dataAddress[i] + dol->dataLength[i];
+    }
+  }
+
+  /*** And of course, any BSS section ***/
+  if (dol->bssAddress)
+  {
+    if ((dol->bssAddress + dol->bssLength) > maxaddress)
+      maxaddress = dol->bssAddress + dol->bssLength;
+  }
+
+  /*** Some OLD dols, Xrick in particular, require ~128k clear memory ***/
+  maxaddress += 0x20000;
+}
+
+/****************************************************************************
+* DOLtoARAM
+*
+* Moves the DOL from main memory to ARAM, positioning as it goes
+*
+* Pass in a memory pointer to a previously loaded DOL
+****************************************************************************/
+int DOLtoARAM(const char *dol_name)
+{
+  u32 sizeinbytes;
+  int i, j;
+  static DOLHEADER dolhead;
+  FILE *f = fopen(dol_name, "rb");
+  
+  if (!f)
+    return 1;
+
+  fread(&dolhead, 1, sizeof(DOLHEADER), f);
+  /*** Make sure ARAM subsystem is alive! ***/
+  AR_Init(NULL, 0); /*** No stack - we need it all ***/
+  ARAMClear();
+
+  /*** Get DOL header ***/
+  dolhdr = (DOLHEADER *) &dolhead;
+
+  /*** First, does this look like a DOL? ***/
+  if (dolhdr->textOffset[0] != DOLHDRLENGTH)
+    return 0;
+
+  /*** Get DOL stats ***/
+  DOLMinMax(dolhdr);
+  sizeinbytes = maxaddress - minaddress;
+
+  /*** Move all DOL sections into ARAM ***/
+  /*** Move text sections ***/
+  for (i = 0; i < MAXTEXTSECTION; i++)
+  {
+    /*** This may seem strange, but in developing d0lLZ we found some with section addresses with zero length ***/
+    if (dolhdr->textAddress[i] && dolhdr->textLength[i])
+    {
+      fseek(f, dolhdr->textOffset[i], SEEK_SET);
+      unsigned count = dolhdr->textLength[i] / sizeof(dol_readbuf);
+      for (j = 0; j < count; j++)
+      {
+        fread(dol_readbuf, 1, sizeof(dol_readbuf), f);
+        ARAMPut(dol_readbuf, (char *) ((dolhdr->textAddress[i] - minaddress) + (sizeof(dol_readbuf) * i) + ARAMSTART),
+                sizeof(dol_readbuf));
+      }
+      unsigned remaining = dolhdr->textLength[i] % sizeof(dol_readbuf);
+      if (remaining)
+      {
+        fread(dol_readbuf, 1, remaining, f);
+        ARAMPut(dol_readbuf, (char *) ((dolhdr->textAddress[i] - minaddress) + (count * i) + ARAMSTART),
+                remaining);
+      }
+    }
+  }
+
+  /*** Move data sections ***/
+  for (i = 0; i < MAXDATASECTION; i++)
+  {
+    if (dolhdr->dataAddress[i] && dolhdr->dataLength[i])
+    {
+      fseek(f, dolhdr->dataOffset[i], SEEK_SET);
+      unsigned count = dolhdr->dataLength[i] / sizeof(dol_readbuf);
+      for (j = 0; j < count; j++)
+      {
+        fread(dol_readbuf, 1, sizeof(dol_readbuf), f);
+        ARAMPut(dol_readbuf, (char *) ((dolhdr->dataAddress[i] - minaddress) + (sizeof(dol_readbuf) * i) + ARAMSTART),
+                sizeof(dol_readbuf));
+      }
+      unsigned remaining = dolhdr->dataLength[i] % sizeof(dol_readbuf);
+      if (remaining)
+      {
+        fread(dol_readbuf, 1, remaining, f);
+        ARAMPut(dol_readbuf, (char *) ((dolhdr->dataAddress[i] - minaddress) + (count * i) + ARAMSTART),
+                remaining);
+      }
+    }
+  }
+
+  fclose(f);
+
+  /*** Now go run it ***/
+  ARAMRun(dolhdr->entryPoint, minaddress, ARAMSTART, sizeinbytes);
+
+  /*** Will never return ***/
+  return 1;
+}
+#endif
diff --git a/ngc/sidestep.h b/ngc/sidestep.h
new file mode 100644
index 0000000000..faeaafc76f
--- /dev/null
+++ b/ngc/sidestep.h
@@ -0,0 +1,39 @@
+/****************************************************************************
+* SideStep DOL Loading
+*
+* This module runs a DOL file from Auxilliary RAM. This removes any memory
+* issues which might occur - and also means you can easily overwrite yourself!
+*
+* softdev March 2007
+***************************************************************************/
+#ifndef HW_RVL
+#ifndef __SIDESTEP__
+#define __SIDESTEP__
+
+/*** A standard DOL header ***/
+#define DOLHDRLENGTH 256	/*** All DOLS must have a 256 byte header ***/
+#define MAXTEXTSECTION 7
+#define MAXDATASECTION 11
+
+/*** A handy DOL structure ***/
+typedef struct {
+    unsigned int textOffset[MAXTEXTSECTION];
+    unsigned int dataOffset[MAXDATASECTION];
+
+    unsigned int textAddress[MAXTEXTSECTION];
+    unsigned int dataAddress[MAXDATASECTION];
+
+    unsigned int textLength[MAXTEXTSECTION];
+    unsigned int dataLength[MAXDATASECTION];
+
+    unsigned int bssAddress;
+    unsigned int bssLength;
+
+    unsigned int entryPoint;
+    unsigned int unused[MAXTEXTSECTION];
+} DOLHEADER;
+
+int DOLtoARAM(const char *dol_name);
+
+#endif
+#endif
diff --git a/ngc/ssaram.c b/ngc/ssaram.c
new file mode 100644
index 0000000000..2b59f5af9b
--- /dev/null
+++ b/ngc/ssaram.c
@@ -0,0 +1,106 @@
+/** This code is licensed to you under the terms of the GNU GPL, version 2;
+    see file COPYING or http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt */
+
+/****************************************************************************
+* SSARAM
+***************************************************************************/
+#ifndef HW_RVL
+#include <gccore.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "ssaram.h"
+
+static char aramfix[2048] ATTRIBUTE_ALIGN(32);
+
+#define ARAMSTART  0x8000
+#define ARAM_READ  1
+#define ARAM_WRITE 0
+
+/****************************************************************************
+* ARAMPut
+*
+* This version of ARAMPut fixes up those segments which are misaligned.
+* The IPL rules for DOLs is that they must contain 32byte aligned sections with
+* 32byte aligned lengths.
+*
+* The reality is that most homebrew DOLs don't adhere to this.
+****************************************************************************/
+void ARAMPut(char *src, char *dst, int len)
+{
+  u32 misalignaddress;
+  u32 misalignedbytes;
+  u32 misalignedbytestodo;
+
+  int i, block;
+  int offset = 0;
+
+  /*** Check destination alignment ***/
+  if ((u32) dst & 0x1f)
+  {
+    /*** Retrieve previous 32 byte section ***/
+    misalignaddress = ((u32) dst & ~0x1f);
+    misalignedbytestodo = 32 - ((u32) dst & 0x1f);
+    misalignedbytes = ((u32) dst & 0x1f);
+    ARAMFetch(aramfix, (char *) misalignaddress, 32);
+
+    /*** Update from source ***/
+    memcpy(aramfix + misalignedbytes, src, misalignedbytestodo);
+
+    /*** Put it back ***/
+    DCFlushRange(aramfix, 32);
+    AR_StartDMA(ARAM_WRITE, (u32) aramfix, (u32) dst & ~0x1f, 32);
+    while (AR_GetDMAStatus());
+
+    /*** Update pointers ***/
+    src += misalignedbytestodo;
+    len -= misalignedbytestodo;
+    dst = (char *) (((u32) dst & ~0x1f) + 32);
+  }
+
+  /*** Move 2k blocks - saves aligning source buffer ***/
+  block = (len >> 11);
+  for (i = 0; i < block; i++)
+  {
+    memcpy(aramfix, src + offset, 2048);
+    DCFlushRange(aramfix, 2048);
+    AR_StartDMA(ARAM_WRITE, (u32) aramfix, (u32) dst + offset, 2048);
+    while (AR_GetDMAStatus());
+    offset += 2048;
+  }
+
+  /*** Clean up remainder ***/
+  len &= 0x7ff;
+  if (len)
+  {
+    block = len & 0x1f;		/*** Is length aligned ? ***/
+    memcpy(aramfix, src + offset, len & ~0x1f);
+    DCFlushRange(aramfix, len & ~0x1f);
+    AR_StartDMA(ARAM_WRITE, (u32) aramfix, (u32) dst + offset, len & ~0x1f);
+    while (AR_GetDMAStatus());
+
+    if (block)
+    {
+      offset += len & ~0x1f;
+      misalignedbytes = len & 0x1f;
+
+      /*** Do same shuffle as destination alignment ***/
+      ARAMFetch(aramfix, dst + offset, 32);
+      memcpy(aramfix, src + offset, misalignedbytes);
+      DCFlushRange(aramfix, 32);
+      AR_StartDMA(ARAM_WRITE, (u32) aramfix, (u32) dst + offset, 32);
+      while (AR_GetDMAStatus());
+    }
+  }
+}
+
+/****************************************************************************
+* ARAMFetch
+****************************************************************************/
+void ARAMFetch(char *dst, char *src, int len)
+{
+    DCInvalidateRange(dst, len);
+    AR_StartDMA(ARAM_READ, (u32) dst, (u32) src, len);
+    while (AR_GetDMAStatus());
+}
+#endif
diff --git a/ngc/ssaram.h b/ngc/ssaram.h
new file mode 100644
index 0000000000..db3f1eeb74
--- /dev/null
+++ b/ngc/ssaram.h
@@ -0,0 +1,12 @@
+/****************************************************************************
+* SSARAM
+***************************************************************************/
+#ifndef HW_RVL
+#ifndef __SSARAM__
+#define __SSARAM__
+
+void ARAMPut(char *src, char *dst, int len);
+void ARAMFetch(char *dst, char *src, int len);
+
+#endif
+#endif
diff --git a/gx/app_booter/Makefile b/wii/app_booter/Makefile
similarity index 77%
rename from gx/app_booter/Makefile
rename to wii/app_booter/Makefile
index a5dd8129a9..ea13bfa32a 100644
--- a/gx/app_booter/Makefile
+++ b/wii/app_booter/Makefile
@@ -18,27 +18,16 @@ CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
 LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
 OBJCOPY = $(DEVKITPPC)/bin/powerpc-eabi-objcopy$(EXE_EXT)
 
-ifeq ($(platform),wii)
-   BIN_TARGET := app_booter_wii.bin
-   ELF_TARGET := app_booter_wii.elf
-else
-   BIN_TARGET := app_booter_ngc.bin
-   ELF_TARGET := app_booter_ngc.elf
-endif
+BIN_TARGET := app_booter.bin
+ELF_TARGET := app_booter.elf
 
 INCLUDE := -I. -I$(DEVKITPRO)/libogc/include
 LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii
 
-MACHDEP := -mno-eabi -mno-sdata -mcpu=750
+MACHDEP := -DHW_RVL -DGEKKO -mno-eabi -mno-sdata -mcpu=750
 # todo: find out why -Os spits out linker errors
 CFLAGS += -Wall -O2 -ffreestanding -std=gnu99 $(MACHDEP) $(INCLUDE)
 
-ifeq ($(platform),wii)
-   CFLAGS += -DHW_RVL
-else
-   CFLAGS += -DHW_DOL
-endif
-
 LDFLAGS := -T link.ld
 
 OBJ = crt0.o dolloader.o elfloader.o main.o string.o sync.o
diff --git a/gx/app_booter/crt0.s b/wii/app_booter/crt0.s
similarity index 100%
rename from gx/app_booter/crt0.s
rename to wii/app_booter/crt0.s
diff --git a/gx/app_booter/dolloader.c b/wii/app_booter/dolloader.c
similarity index 100%
rename from gx/app_booter/dolloader.c
rename to wii/app_booter/dolloader.c
diff --git a/gx/app_booter/dolloader.h b/wii/app_booter/dolloader.h
similarity index 100%
rename from gx/app_booter/dolloader.h
rename to wii/app_booter/dolloader.h
diff --git a/gx/app_booter/elf_abi.h b/wii/app_booter/elf_abi.h
similarity index 100%
rename from gx/app_booter/elf_abi.h
rename to wii/app_booter/elf_abi.h
diff --git a/gx/app_booter/elfloader.c b/wii/app_booter/elfloader.c
similarity index 100%
rename from gx/app_booter/elfloader.c
rename to wii/app_booter/elfloader.c
diff --git a/gx/app_booter/elfloader.h b/wii/app_booter/elfloader.h
similarity index 100%
rename from gx/app_booter/elfloader.h
rename to wii/app_booter/elfloader.h
diff --git a/gx/app_booter/link.ld b/wii/app_booter/link.ld
similarity index 100%
rename from gx/app_booter/link.ld
rename to wii/app_booter/link.ld
diff --git a/gx/app_booter/main.c b/wii/app_booter/main.c
similarity index 81%
rename from gx/app_booter/main.c
rename to wii/app_booter/main.c
index b84a5dc8b8..5a03b02315 100644
--- a/gx/app_booter/main.c
+++ b/wii/app_booter/main.c
@@ -10,22 +10,14 @@
 #include "elfloader.h"
 #include "sync.h"
 
-#if HW_RVL
 #define EXECUTABLE_MEM_ADDR 0x91800000
 #define SYSTEM_ARGV	((struct __argv *) 0x93200000)
-#endif
 
 // if we name this main, GCC inserts the __eabi symbol, even when we specify -mno-eabi
 // what a lovely "feature"
 void app_booter_main(void)
 {
-#if HW_RVL
 	void *exeBuffer = (void *) EXECUTABLE_MEM_ADDR;
-#else
-   uint8_t _exeBuffer[0x200]; // should be enough for most elf headers, and more than enough for dol headers
-   memcpy(_exeBuffer, 0, sizeof(_exeBuffer));
-   void *exeBuffer = _exeBuffer;
-#endif
 	u32 exeEntryPointAddress = 0;
 	entrypoint exeEntryPoint;
 
@@ -38,14 +30,12 @@ void app_booter_main(void)
 	if (!exeEntryPoint)
 		return;
 
-#ifdef HW_RVL
 	if (SYSTEM_ARGV->argvMagic == ARGV_MAGIC)
 	{
 		void *new_argv = (void *) (exeEntryPointAddress + 8);
 		memcpy(new_argv, SYSTEM_ARGV, sizeof(struct __argv));
 		sync_before_exec(new_argv, sizeof(struct __argv));
 	}
-#endif
 
 	exeEntryPoint ();
 }
diff --git a/wii/app_booter/string.c b/wii/app_booter/string.c
new file mode 100644
index 0000000000..0e6b31a1e6
--- /dev/null
+++ b/wii/app_booter/string.c
@@ -0,0 +1,25 @@
+// Copyright 2008-2009  Segher Boessenkool  <segher@kernel.crashing.org>
+// This code is licensed to you under the terms of the GNU GPL, version 2;
+// see file COPYING or http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+
+#include <stdio.h>
+
+void *memset(void *b, int c, size_t len)
+{
+   size_t i;
+
+   for (i = 0; i < len; i++)
+      ((unsigned char *)b)[i] = c;
+
+   return b;
+}
+
+void *memcpy(void *dst, const void *src, size_t len)
+{
+   size_t i;
+
+   for (i = 0; i < len; i++)
+      ((unsigned char *)dst)[i] = ((unsigned char *)src)[i];
+
+   return dst;
+}
diff --git a/gx/app_booter/string.h b/wii/app_booter/string.h
similarity index 100%
rename from gx/app_booter/string.h
rename to wii/app_booter/string.h
diff --git a/gx/app_booter/sync.c b/wii/app_booter/sync.c
similarity index 100%
rename from gx/app_booter/sync.c
rename to wii/app_booter/sync.c
diff --git a/gx/app_booter/sync.h b/wii/app_booter/sync.h
similarity index 100%
rename from gx/app_booter/sync.h
rename to wii/app_booter/sync.h