o WIP file cache code borrowed from PS2 port.

o add property

svn-id: r23062

7 files changed, 320 insertions, 223 deletions

diff --git a/backends/fs/gp32/gp32-fs.cpp b/backends/fs/gp32/gp32-fs.cpp
index 2b1d35c36f..41900f71f6 100644
--- a/backends/fs/gp32/gp32-fs.cpp
+++ b/backends/fs/gp32/gp32-fs.cpp
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/gp32/gp32-fs.cpp $
- * $Id: gp32-fs.cpp 23022 2006-06-11 10:08:53Z wonst719 $
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/backends/gp32/Makefile b/backends/gp32/Makefile
index efda74bfe0..144ce36221 100644
--- a/backends/gp32/Makefile
+++ b/backends/gp32/Makefile
@@ -123,6 +123,7 @@ OBJS	+=	backends/gp32/startup.o \
 
 # Custom GP32 std library
 OBJS	+=	backends/gp32/gp32std.o \
+			backends/gp32/gp32std_file.o \
 			backends/gp32/gp32std_grap.o \
 			backends/gp32/gp32std_input.o \
 			backends/gp32/gp32std_sound.o \
diff --git a/backends/gp32/gp32std.cpp b/backends/gp32/gp32std.cpp
index 2a7f06177d..2e3cbea6cc 100644
--- a/backends/gp32/gp32std.cpp
+++ b/backends/gp32/gp32std.cpp
@@ -34,12 +34,6 @@
 #include "backends/gp32/gp32std.h"
 #include "backends/gp32/gp32std_grap.h"
 
-FILE *gp_stderr = NULL;
-FILE *gp_stdout = NULL;
-FILE *gp_stdin = NULL;
-
-//#define USE_CACHE
-
 #define DEBUG_MAX 5
 char debline[DEBUG_MAX][256];
 static int debnext = 0;
@@ -71,194 +65,6 @@ void _dprintf(const char *s, ...) {
 //	gp_delay(100);
 }
 
-//////////////////
-//File functions
-
-GPFILE *gp_fopen(const char *fileName, const char *openMode) {
-	//FIXME: allocation, mode, malloc -> new
-	uint32 mode;
-	GPFILE *file;
-	ERR_CODE err;
-	char tempPath[256];
-
-	if (!strchr(fileName, '.')) {
-		sprintf(tempPath, "%s.", fileName);
-		fileName = tempPath;
-	}
-
-	file = (GPFILE *)malloc(sizeof(GPFILE));
-
-//	NP("%s(\"%s\", \"%s\")", __FUNCTION__, fileName, openMode);
-
-	// FIXME add binary/text support
-	if (tolower(openMode[0]) == 'r') {
-		mode = OPEN_R;
-		GpFileGetSize(fileName, &file->size);
-		err = GpFileOpen(fileName, mode, &file->handle);
-	} else if (tolower(openMode[0]) == 'w') {
-		//printf("open if as W");
-		file->size = 0;	// FIXME? new file has no size?
-		file->cachePos = 0;
-		mode = OPEN_W;
-		err = GpFileCreate(fileName, ALWAYS_CREATE, &file->handle);
-	} else if (tolower(openMode[0]) == 'a') {
-		warning("We do not support 'a' file open mode.");
-		free(file);
-		return NULL;
-	} else {
-		error("wrong file mode");
-	}
-
-	if (!file) {
-		error("%s: cannot create FILE structure", __FUNCTION__);
-	}
-	if (err) {
-//		BP("%s: IO error %d", __FUNCTION__, err);
-		free(file);
-		return NULL;
-	}
-
-	return file;
-}
-
-int gp_fclose(GPFILE *stream) {
-	if (!stream) {
-		//warning("closing null file");
-		return 1;
-	}
-
-/*	if (*(uint32 *)((char *)stream - sizeof(uint32)) == 0x4321) {
-		debug(0, "Double closing", __FUNCTION__);
-		return 1;
-	}
-*/
-
-#ifdef USE_CACHE
-	if (stream->cachePos) {
-		GpFileWrite(stream->handle, (char *)stream->cacheData, stream->cachePos); // flush cache
-		stream->cachePos = 0;
-	}
-#endif
-
-	ERR_CODE err = GpFileClose(stream->handle);
-	free(stream);
-
-	return err;
-}
-
-int gp_fseek(GPFILE *stream, long offset, int whence) {
-	ulong dummy;
-
-	switch (whence) {
-	case SEEK_SET:
-		whence = FROM_BEGIN;
-		break;
-	case SEEK_CUR:
-		whence = FROM_CURRENT;
-		break;
-	case SEEK_END:
-		whence = FROM_END;
-		break;
-	}
-	return GpFileSeek(stream->handle, whence, offset, (long *)&dummy);
-}
-
-//TODO: read cache
-size_t gp_fread(void *ptr, size_t size, size_t n, GPFILE *stream) {
-	ulong readcount = 0;
-	ERR_CODE err = GpFileRead(stream->handle, ptr, size * n, &readcount); //fixme? size*n
-	return readcount / size;	//FIXME?
-}
-
-size_t gp_fwrite(const void *ptr, size_t size, size_t n, GPFILE *stream) {
-	int len = size * n;
-
-	if (!stream) {
-		//warning("writing to null file");
-		return 0;
-	}
-
-#ifdef USE_CACHE
-	if (stream->cachePos + len < FCACHE_SIZE) {
-		memcpy(stream->cacheData + stream->cachePos, ptr, len);
-		stream->cachePos += len;
-	} else {
-		if (stream->cachePos) {
-			GpFileWrite(stream->handle, stream->cacheData, stream->cachePos);	// flush cache
-			stream->cachePos = 0;
-		}
-
-#endif
-		ERR_CODE err = GpFileWrite(stream->handle, ptr, len);
-		if (!err)
-			return n;
-		else
-			return -err;
-#ifdef USE_CACHE
-	}
-#endif
-	return 0;
-}
-
-//FIXME? use standard func
-long gp_ftell(GPFILE *stream) {
-	ulong pos = 0;
-	ERR_CODE err = GpFileSeek(stream->handle, FROM_CURRENT, 0, (long*)&pos);
-	return pos;
-}
-
-void gp_clearerr(GPFILE *stream)
-{
-}
-
-//FIXME!
-int gp_feof(GPFILE *stream) {
-	return gp_ftell(stream) >= stream->size;
-}
-
-char gp_fgetc(GPFILE *stream) {
-	char c[1];
-
-	gp_fread(&c[0], 1, 1, stream);
-	return c[0];
-}
-
-char *gp_fgets(char *s, int n, GPFILE *stream) {
-	int i = 0;
-
-	while (!gp_feof(stream) && i < n) {
-		gp_fread(&s[i], 1, 1, stream);
-		if (s[i] == '\n') {
-			s[i + 1] = 0;
-			return s;
-		}
-		i++;
-	}
-	if (gp_feof(stream))
-		return NULL;
-	else
-		return s;
-}
-
-int gp_fprintf(GPFILE *stream, const char *fmt, ...) {
-	char s[256];
-	va_list marker;
-
-	va_start(marker, fmt);
-	vsnprintf(s, 256, fmt, marker);
-	va_end(marker);
-
-	return gp_fwrite(s, 1, strlen(s), stream);
-}
-
-int gp_fflush(GPFILE *stream) {
-	return 0;
-}
-
-int gp_ferror(GPFILE *stream) {
-	return 0;
-}
-
 /////////////////////
 //Memory management
 #undef memcpy
diff --git a/backends/gp32/gp32std.h b/backends/gp32/gp32std.h
index 40d2829bd0..327860c489 100644
--- a/backends/gp32/gp32std.h
+++ b/backends/gp32/gp32std.h
@@ -39,33 +39,6 @@
 #define LCD_WIDTH 320
 #define LCD_HEIGHT 240
 
-#define FCACHE_SIZE 8 * 1024
-
-typedef struct {
-	F_HANDLE handle;
-	unsigned long size;
-	unsigned long cachePos;		//cache position
-	unsigned char cacheData[FCACHE_SIZE];
-} GPFILE;
-
-extern GPFILE *gp_stderr;
-extern GPFILE *gp_stdout;
-extern GPFILE *gp_stdin;
-
-extern GPFILE *	gp_fopen(const char *filename, const char *mode);
-extern int		gp_fclose(GPFILE *stream);
-extern int		gp_fseek(GPFILE *stream, long offset, int whence);
-extern size_t	gp_fread(void *ptr, size_t size, size_t n, GPFILE *stream);
-extern size_t	gp_fwrite(const void *ptr, size_t size, size_t n, GPFILE *stream);
-extern long		gp_ftell(GPFILE *stream);
-extern void		gp_clearerr(GPFILE *stream);
-extern int		gp_feof(GPFILE *stream);
-extern char		gp_fgetc(GPFILE *stream);
-extern char *	gp_fgets(char *s, int n, GPFILE *stream);
-extern int		gp_fflush(GPFILE *stream);
-extern int		gp_ferror(GPFILE *stream);
-extern int		gp_fprintf(GPFILE *stream, const char *fmt, ...);
-
 extern char *	gp_strcpy(char *dst, const char *src);
 extern char *	gp_strncpy(char *dst, const char *src, size_t count);
 extern char *	gp_strcat(char *dst, const char *src);
diff --git a/backends/gp32/gp32std_file.cpp b/backends/gp32/gp32std_file.cpp
new file mode 100644
index 0000000000..eb0d71c61d
--- /dev/null
+++ b/backends/gp32/gp32std_file.cpp
@@ -0,0 +1,256 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001-2006 The ScummVM project
+ * Copyright (C) 2002 Ph0x - GP32 Backend
+ * Copyright (C) 2003/2004 DJWillis - GP32 Backend
+ * Copyright (C) 2005 Won Star - GP32 Backend
+ *
+ * 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.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+
+#include "stdafx.h"
+#include "common/scummsys.h"
+//#include "graphics/scaler.h"
+#include "common/system.h"
+#include "backends/intern.h"
+
+#include "gp32std.h"
+#include "gp32std_file.h"
+
+FILE *gp_stderr = NULL;
+FILE *gp_stdout = NULL;
+FILE *gp_stdin = NULL;
+
+// Cache Idea / Code borrowed from the ps2 port
+//#define USE_CACHE
+
+//////////////////
+//File functions
+
+GPFILE *gp_fopen(const char *fileName, const char *openMode) {
+	//FIXME: allocation, mode
+	uint32 mode;
+	GPFILE *file;
+	ERR_CODE err;
+	char tempPath[256];
+
+	if (!strchr(fileName, '.')) {
+		sprintf(tempPath, "%s.", fileName);
+		fileName = tempPath;
+	}
+
+	file = new GPFILE;
+
+//	NP("%s(\"%s\", \"%s\")", __FUNCTION__, fileName, openMode);
+
+	// FIXME add binary/text support
+	if (tolower(openMode[0]) == 'r') {
+		mode = OPEN_R;
+		GpFileGetSize(fileName, &file->fileSize);
+		err = GpFileOpen(fileName, mode, &file->handle);
+	} else if (tolower(openMode[0]) == 'w') {
+		file->fileSize = 0;
+		mode = OPEN_W;
+		err = GpFileCreate(fileName, ALWAYS_CREATE, &file->handle);
+	} else if (tolower(openMode[0]) == 'a') {
+		warning("We do not support 'a' file open mode.");
+		delete file;
+		return NULL;
+	} else {
+		error("wrong file mode");
+	}
+
+	if (!file) {
+		error("%s: cannot create FILE structure", __FUNCTION__);
+	}
+
+	if (err) {
+		printf("gp_gopen(): IO error %d", err);
+		delete file;
+		return NULL;
+	}
+
+	file->mode = mode;
+	file->cachePos = 0;
+	file->bytesInCache = 0;
+
+	return file;
+}
+
+int gp_fclose(GPFILE *stream) {
+	if (!stream) {
+		//warning("closing null file");
+		return 1;
+	}
+
+/*	if (*(uint32 *)((char *)stream - sizeof(uint32)) == 0x4321) {
+		debug(0, "Double closing", __FUNCTION__);
+		return 1;
+	}
+*/
+
+#ifdef USE_CACHE
+	if (stream->cachePos && stream->mode == OPEN_W) {
+		GpFileWrite(stream->handle, (char *)stream->cacheData, stream->cachePos); // flush cache
+		stream->cachePos = 0;
+	}
+#endif
+
+	ERR_CODE err = GpFileClose(stream->handle);
+	delete stream;
+
+	return err;
+}
+
+int gp_fseek(GPFILE *stream, long offset, int whence) {
+	switch (whence) {
+	case SEEK_SET:
+		whence = FROM_BEGIN;
+		break;
+	case SEEK_CUR:
+		whence = FROM_CURRENT;
+		break;
+	case SEEK_END:
+		whence = FROM_END;
+		break;
+	}
+	return GpFileSeek(stream->handle, whence, offset, (long *)&stream->filePos);	//FIXME?
+}
+
+size_t gp_fread(void *ptr, size_t size, size_t n, GPFILE *stream) {
+	ulong readcount = 0;
+	int len = size * n;
+	
+#ifdef USE_CACHE
+	uint8 *dest = (uint8 *)ptr;
+
+	while (len && (stream->filePos != stream->fileSize)) {
+		if (stream->cachePos <= filePos && filePos < stream->cachePos + stream->bytesInCache) {
+			uint32 startPos = (stream->cacheBufOffs + (stream->filePos - stream->cachePos)) % FCACHE_SIZE;
+			uint32 copyLen = stream->bytesInCache - (stream->filePos - stream->cachePos);
+			if (copyLen > len)
+				copyLen = len;
+			if (startPos + copyLen > FCACHE_SIZE)
+				copyLen = FCACHE_SIZE - startPos;
+
+			memcpy(dest, cacheData + startPos, copyLen);
+
+			filePos += copyLen;
+			dest += copyLen;
+			len -= copyLen;
+		} else {
+#endif
+			ERR_CODE err = GpFileRead(stream->handle, ptr, len, &readcount);
+
+#ifdef USE_CACHE
+			stream->filePos += len;
+		}
+	}
+#endif
+
+	return readcount / size;	//FIXME?
+}
+
+size_t gp_fwrite(const void *ptr, size_t size, size_t n, GPFILE *stream) {
+	int len = size * n;
+
+	if (!stream) {
+		//warning("writing to null file");
+		return 0;
+	}
+
+#ifdef USE_CACHE
+	if (stream->cachePos + len < FCACHE_SIZE) {
+		memcpy(stream->cacheData + stream->cachePos, ptr, len);
+		stream->cachePos += len;
+	} else {
+		if (stream->cachePos) {
+			GpFileWrite(stream->handle, stream->cacheData, stream->cachePos);	// flush cache
+			stream->cachePos = 0;
+		}
+
+#endif
+		ERR_CODE err = GpFileWrite(stream->handle, ptr, len);
+		if (!err)
+			return n;
+		else
+			return -err;
+#ifdef USE_CACHE
+	}
+#endif
+	return 0;
+}
+
+//FIXME? use standard func
+long gp_ftell(GPFILE *stream) {
+	ulong pos = 0;
+	ERR_CODE err = GpFileSeek(stream->handle, FROM_CURRENT, 0, (long*)&pos);
+	return pos;
+}
+
+void gp_clearerr(GPFILE *stream)
+{
+}
+
+int gp_feof(GPFILE *stream) {
+	return gp_ftell(stream) >= stream->fileSize;
+}
+
+char gp_fgetc(GPFILE *stream) {
+	char c[1];
+
+	gp_fread(&c[0], 1, 1, stream);
+	return c[0];
+}
+
+char *gp_fgets(char *s, int n, GPFILE *stream) {
+	int i = 0;
+
+	while (!gp_feof(stream) && i < n) {
+		gp_fread(&s[i], 1, 1, stream);
+		if (s[i] == '\n') {
+			s[i + 1] = 0;
+			return s;
+		}
+		i++;
+	}
+	if (gp_feof(stream))
+		return NULL;
+	else
+		return s;
+}
+
+int gp_fprintf(GPFILE *stream, const char *fmt, ...) {
+	char s[256];
+	va_list marker;
+
+	va_start(marker, fmt);
+	vsnprintf(s, 256, fmt, marker);
+	va_end(marker);
+
+	return gp_fwrite(s, 1, strlen(s), stream);
+}
+
+int gp_fflush(GPFILE *stream) {
+	return 0;
+}
+
+int gp_ferror(GPFILE *stream) {
+	return 0;
+}
diff --git a/backends/gp32/gp32std_file.h b/backends/gp32/gp32std_file.h
new file mode 100644
index 0000000000..933ae482ff
--- /dev/null
+++ b/backends/gp32/gp32std_file.h
@@ -0,0 +1,60 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001-2006 The ScummVM project
+ * Copyright (C) 2002 Ph0x - GP32 Backend
+ * Copyright (C) 2003/2004 DJWillis - GP32 Backend
+ * Copyright (C) 2005 Won Star - GP32 Backend
+ *
+ * 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.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef __GP32STD_FILE_H
+#define __GP32STD_FILE_H
+
+#define FCACHE_SIZE 8 * 1024
+
+typedef struct {
+	F_HANDLE handle;
+	unsigned long mode;
+	unsigned long fileSize;
+	unsigned long filePos;
+	unsigned long cachePos;
+	unsigned long cacheBufOffs;
+	unsigned long bytesInCache;
+	unsigned char cacheData[FCACHE_SIZE];
+} GPFILE;
+
+extern GPFILE *gp_stderr;
+extern GPFILE *gp_stdout;
+extern GPFILE *gp_stdin;
+
+extern GPFILE *	gp_fopen(const char *filename, const char *mode);
+extern int		gp_fclose(GPFILE *stream);
+extern int		gp_fseek(GPFILE *stream, long offset, int whence);
+extern size_t	gp_fread(void *ptr, size_t size, size_t n, GPFILE *stream);
+extern size_t	gp_fwrite(const void *ptr, size_t size, size_t n, GPFILE *stream);
+extern long		gp_ftell(GPFILE *stream);
+extern void		gp_clearerr(GPFILE *stream);
+extern int		gp_feof(GPFILE *stream);
+extern char		gp_fgetc(GPFILE *stream);
+extern char *	gp_fgets(char *s, int n, GPFILE *stream);
+extern int		gp_fflush(GPFILE *stream);
+extern int		gp_ferror(GPFILE *stream);
+extern int		gp_fprintf(GPFILE *stream, const char *fmt, ...);
+
+#endif
diff --git a/backends/gp32/portdefs.h b/backends/gp32/portdefs.h
index 756cfa61c4..a56658ed76 100644
--- a/backends/gp32/portdefs.h
+++ b/backends/gp32/portdefs.h
@@ -35,6 +35,7 @@
 #include <cctype>
 
 #include "gp32std.h"
+#include "gp32std_file.h"
 
 #undef byte