Cleanups

src/fceu-endian.c

@@ -26,70 +26,98 @@
 #include "fceu-types.h"
 #include "fceu-endian.h"
 
-void FlipByteOrder(uint8 *src, uint32 count) {
-	uint8 *start = src;
-	uint8 *end = src + count - 1;
+void FlipByteOrder(uint8 *src, uint32 count)
+{
+   uint8 *start = src;
+   uint8 *end = src + count - 1;
 
-	if ((count & 1) || !count) return;	/* This shouldn't happen. */
+   while(start < end)
+   {
+      uint8 tmp;
 
-	while (count--) {
-		uint8 tmp;
-
-		tmp = *end;
-		*end = *start;
-		*start = tmp;
-		end--;
-		start++;
-	}
+      tmp = *end;
+      *end = *start;
+      *start = tmp;
+      end--;
+      start++;
+   }
 }
 
-int write16le(uint16 b, FILE *fp) {
-	uint8 s[2];
-	s[0] = b;
-	s[1] = b >> 8;
-	return((fwrite(s, 1, 2, fp) < 2) ? 0 : 2);
+int write16le(uint16 b, FILE *fp)
+{
+   uint8 s[2];
+   s[0] = b;
+   s[1] = b >> 8;
+   return((fwrite(s, 1, 2, fp) < 2) ? 0 : 2);
 }
 
-int write32le(uint32 b, FILE *fp) {
-	uint8 s[4];
-	s[0] = b;
-	s[1] = b >> 8;
-	s[2] = b >> 16;
-	s[3] = b >> 24;
-	return((fwrite(s, 1, 4, fp) < 4) ? 0 : 4);
+int write32le(uint32 b, FILE *fp)
+{
+   uint8 s[4];
+   s[0] = b;
+   s[1] = b >> 8;
+   s[2] = b >> 16;
+   s[3] = b >> 24;
+   return((fwrite(s, 1, 4, fp) < 4) ? 0 : 4);
 }
 
-int read32le(uint32 *Bufo, FILE *fp) {
-	uint32 buf;
-	if (fread(&buf, 1, 4, fp) < 4)
-		return 0;
- #ifdef MSB_FIRST
-	*(uint32*)Bufo = ((buf & 0xFF) << 24) | ((buf & 0xFF00) << 8) | ((buf & 0xFF0000) >> 8) | ((buf & 0xFF000000) >> 24);
- #else
-	*(uint32*)Bufo = buf;
- #endif
-	return 1;
+int read32le(uint32 *Bufo, FILE *fp)
+{
+   uint32 buf;
+   if (fread(&buf, 1, 4, fp) < 4)
+      return 0;
+#ifdef MSB_FIRST
+   *(uint32*)Bufo = ((buf & 0xFF) << 24) | ((buf & 0xFF00) << 8) | ((buf & 0xFF0000) >> 8) | ((buf & 0xFF000000) >> 24);
+#else
+   *(uint32*)Bufo = buf;
+#endif
+   return 1;
 }
 
-int read16le(char *d, FILE *fp) {
- #ifdef MSB_FIRST
-	int ret;
-	ret = fread(d + 1, 1, 1, fp);
-	ret += fread(d, 1, 1, fp);
-	return ret < 2 ? 0 : 2;
- #else
-	return((fread(d, 1, 2, fp) < 2) ? 0 : 2);
- #endif
+int write32le_mem(uint32 b, memstream_t *mem)
+{
+   uint8 s[4];
+   s[0]=b;
+   s[1]=b>>8;
+   s[2]=b>>16;
+   s[3]=b>>24;
+   return((memstream_write(mem, s, 4)<4)?0:4);
 }
 
-void FCEU_en32lsb(uint8 *buf, uint32 morp) {
-	buf[0] = morp;
-	buf[1] = morp >> 8;
-	buf[2] = morp >> 16;
-	buf[3] = morp >> 24;
+int read32le_mem(uint32 *Bufo, memstream_t *mem)
+{
+   uint32 buf;
+   if(memstream_read(mem, &buf, 4)<4)
+      return 0;
+#ifdef MSB_FIRST
+   *(uint32*)Bufo=((buf&0xFF)<<24)|((buf&0xFF00)<<8)|((buf&0xFF0000)>>8)|((buf&0xFF000000)>>24);
+#else
+   *(uint32*)Bufo=buf;
+#endif
+   return 1;
 }
 
-uint32 FCEU_de32lsb(uint8 *morp) {
-	return(morp[0] | (morp[1] << 8) | (morp[2] << 16) | (morp[3] << 24));
+int read16le(char *d, FILE *fp)
+{
+#ifdef MSB_FIRST
+   int ret;
+   ret = fread(d + 1, 1, 1, fp);
+   ret += fread(d, 1, 1, fp);
+   return ret < 2 ? 0 : 2;
+#else
+   return((fread(d, 1, 2, fp) < 2) ? 0 : 2);
+#endif
 }
 
+void FCEU_en32lsb(uint8 *buf, uint32 morp)
+{
+   buf[0] = morp;
+   buf[1] = morp >> 8;
+   buf[2] = morp >> 16;
+   buf[3] = morp >> 24;
+}
+
+uint32 FCEU_de32lsb(uint8 *morp)
+{
+   return(morp[0] | (morp[1] << 8) | (morp[2] << 16) | (morp[3] << 24));
+}