From 79000b47e2e432b8c8a4440762ddaf53fc5a347b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 6 Aug 2015 13:20:27 +0200
Subject: [PATCH] merge fceu-memory.c

---
 src/drivers/libretro/fceu/fceu-memory.c | 63 --------------------
 src/drivers/libretro/griffin.c          |  2 +-
 src/fceu-memory.c                       | 79 +++++++++----------------
 3 files changed, 28 insertions(+), 116 deletions(-)
 delete mode 100644 src/drivers/libretro/fceu/fceu-memory.c

diff --git a/src/drivers/libretro/fceu/fceu-memory.c b/src/drivers/libretro/fceu/fceu-memory.c
deleted file mode 100644
index 0c97a5d..0000000
--- a/src/drivers/libretro/fceu/fceu-memory.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* FCE Ultra - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2002 Xodnizel
- *
- * 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 2 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.
- *
- * You should have received a copy of the GNU General Public License
- * 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 "fceu-types.h"
-#include "fceu.h"
-#include "fceu-memory.h"
-#include "general.h"
-
-void *FCEU_gmalloc(uint32 size)
-{
-   void *ret;
-   ret = malloc(size);
-   if (!ret)
-   {
-      FCEU_PrintError("Error allocating memory!  Doing a hard exit.");
-      exit(1);
-   }
-   return ret;
-}
-
-void *FCEU_malloc(uint32 size)
-{
-   int retval = 0;
-   void *ret;
-   ret = (void*)malloc(size);
-
-   if (!ret)
-   {
-      FCEU_PrintError("Error allocating memory!");
-      ret = 0;
-   }
-
-   return ret;
-}
-
-void FCEU_free(void *ptr)
-{
-	free(ptr);
-}
-
-void FCEU_gfree(void *ptr)
-{
-	free(ptr);
-}
diff --git a/src/drivers/libretro/griffin.c b/src/drivers/libretro/griffin.c
index 648a8d0..078d8f8 100644
--- a/src/drivers/libretro/griffin.c
+++ b/src/drivers/libretro/griffin.c
@@ -9,7 +9,7 @@
 #include "crc32.c"
 #include "debug.c"
 #include "fceu-endian.c"
-#include "drivers/libretro/fceu/fceu-memory.c"
+#include "fceu-memory.c"
 #include "misc.c"
 #include "fceu.c"
 //#include "fceustr.c"
diff --git a/src/fceu-memory.c b/src/fceu-memory.c
index e48972a..0c97a5d 100644
--- a/src/fceu-memory.c
+++ b/src/fceu-memory.c
@@ -25,64 +25,39 @@
 #include "fceu-memory.h"
 #include "general.h"
 
-void *FCEU_gmalloc(uint32 size) {
-	void *ret;
-	ret = malloc(size);
-	if (!ret) {
-		FCEU_PrintError("Error allocating memory!  Doing a hard exit.");
-		exit(1);
-	}
-	return ret;
+void *FCEU_gmalloc(uint32 size)
+{
+   void *ret;
+   ret = malloc(size);
+   if (!ret)
+   {
+      FCEU_PrintError("Error allocating memory!  Doing a hard exit.");
+      exit(1);
+   }
+   return ret;
 }
 
-void *FCEU_malloc(uint32 size) {
-	void *ret;
-	ret = malloc(size);
-	if (!ret) {
-		FCEU_PrintError("Error allocating memory!");
-		return(0);
-	}
-	return ret;
+void *FCEU_malloc(uint32 size)
+{
+   int retval = 0;
+   void *ret;
+   ret = (void*)malloc(size);
+
+   if (!ret)
+   {
+      FCEU_PrintError("Error allocating memory!");
+      ret = 0;
+   }
+
+   return ret;
 }
 
-void FCEU_free(void *ptr) {		// Might do something with this and FCEU_malloc later...
+void FCEU_free(void *ptr)
+{
 	free(ptr);
 }
 
-void FCEU_gfree(void *ptr) {
+void FCEU_gfree(void *ptr)
+{
 	free(ptr);
 }
-
-void FASTAPASS(3) FCEU_memmove(void *d, void *s, uint32 l) {
-	uint32 x;
-	int t;
-
-	/* Type really doesn't matter. */
-	t = (int)d;
-	t |= (int)s;
-	t |= (int)l;
-
-	if (t & 3) {	// Not 4-byte aligned and/or length is not a multiple of 4.
-		uint8 *tmpd, *tmps;
-
-		tmpd = (uint8*)d;
-		tmps = (uint8*)s;
-
-		for (x = l; x; x--) {	// This could be optimized further, though(more tests could be performed).
-			*tmpd = *tmps;
-			tmpd++;
-			tmps++;
-		}
-	} else {
-		uint32 *tmpd, *tmps;
-
-		tmpd = (uint32*)d;
-		tmps = (uint32*)s;
-
-		for (x = l >> 2; x; x--) {
-			*tmpd = *tmps;
-			tmpd++;
-			tmps++;
-		}
-	}
-}