libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-29 21:24:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Properly init memory tables.

Browse Source 
svn-id: r23342
This commit is contained in:
Won Star 2006-06-29 09:17:04 +00:00
parent 5e7d109e3c
commit 7169e90fad
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backends/gp32/gp32_main.cpp
View File

@ -38,9 +38,6 @@
GlobalVars g_vars;
void init() {
extern void memChunkInit();
memChunkInit();
gp_setCpuSpeed(40); // Default CPU Speed
GpGraphicModeSet(16, NULL);
@ -58,6 +55,9 @@ void init() {
}
void GpMain(void *arg) {
extern void memChunkInit();
memChunkInit();
init();
readConfigVars();
@ -84,6 +84,7 @@ void GpMain(void *arg) {
extern void memChunkDeinit();
memChunkDeinit();
g_system->quit(); // TODO: Consider removing / replacing this!
//return res;

19
backends/gp32/gp32std_memory.cpp
View File

@ -1,6 +1,8 @@
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001-2006 The ScummVM project
* Copyright (C) 2006 Won Star - GP32 Backend
* Copyright (C) 2002 Ph0x - GP32 Backend
* Copyright (C) 2003/2004 DJWillis - GP32 Backend
* Copyright (C) 2005/2006 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
@ -52,7 +54,7 @@ protected:
static int prevBlock;
// Linked list is slow for this task. :)
static MemBlock block[NUM_BLOCK];
static MemBlock *block;
byte *block;
size_t size;
@ -74,23 +76,30 @@ byte *MemBlock::userMem = NULL;
//size_t MemBlock::allocSize = 0;
int MemBlock::numBlock = 0;
int MemBlock::prevBlock = 0;
MemBlock MemBlock::block[NUM_BLOCK];
MemBlock *MemBlock::block = NULL;
void MemBlock::init()
{
userMem = (byte *)gm_malloc(USER_MEMORY_SIZE + USER_BLOCK_SIZE);
if (!userMem) {
block = (MemBlock *)gm_malloc(NUM_BLOCK * sizeof(MemBlock));
if (!(userMem && block)) {
//error
}
memset(userMem, 0, USER_MEMORY_SIZE + USER_BLOCK_SIZE);
memset(block, 0, NUM_BLOCK * sizeof(MemBlock));
}
void MemBlock::deinit()
{
if (!userMem) {
if (!(userMem && block)) {
//error
}
gm_free(userMem);
gm_free(block);
userMem = NULL;
block = NULL;
}
void *MemBlock::addBlock(size_t size)