summaryrefslogtreecommitdiff
path: root/libpcsxcore/psxmem.c
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-09-22 01:50:23 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-09-22 01:50:23 +0000
commit60cf0fcf61b20eed515819ecfd302c208ba88e57 (patch)
treec51f44380630819828dad730551c1a38a9e2533a /libpcsxcore/psxmem.c
parent000f2e2923da84e6b7f1e4d48b9e803a203a4461 (diff)
downloadpcsxr-60cf0fcf61b20eed515819ecfd302c208ba88e57.tar.gz
only load the net yaroze library when running EXE.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@57503 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'libpcsxcore/psxmem.c')
-rw-r--r--libpcsxcore/psxmem.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index aa405ca6..feb69b4f 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -111,7 +111,7 @@ void psxMemReset() {
memset(psxM, 0, 0x00200000);
memset(psxP, 0, 0x00010000);
-
+
// Load BIOS
if (strcmp(Config.Bios, "HLE") != 0) {
sprintf(bios, "%s/%s", Config.BiosDir, Config.Bios);
@@ -126,7 +126,7 @@ void psxMemReset() {
fclose(f);
Config.HLE = FALSE;
}
- } else Config.HLE = TRUE;
+ } else Config.HLE = TRUE;
}
void psxMemShutdown() {
@@ -141,10 +141,10 @@ static int writeok = 1;
u8 psxMemRead8(u32 mem) {
char *p;
- u32 t;
-
-
- psxRegs.cycle += 2;
+ u32 t;
+
+
+ psxRegs.cycle += 2;
t = mem >> 16;
@@ -172,10 +172,10 @@ u16 psxMemRead16(u32 mem) {
char *p;
u32 t;
-
- psxRegs.cycle += 2;
-
-
+
+ psxRegs.cycle += 2;
+
+
t = mem >> 16;
if (t == 0x1f80) {
if (mem < 0x1f801000)
@@ -201,10 +201,10 @@ u32 psxMemRead32(u32 mem) {
char *p;
u32 t;
-
- psxRegs.cycle += 2;
-
-
+
+ psxRegs.cycle += 2;
+
+
t = mem >> 16;
if (t == 0x1f80) {
if (mem < 0x1f801000)
@@ -230,10 +230,10 @@ void psxMemWrite8(u32 mem, u8 value) {
char *p;
u32 t;
-
- psxRegs.cycle += 2;
-
-
+
+ psxRegs.cycle += 2;
+
+
t = mem >> 16;
if (t == 0x1f80) {
if (mem < 0x1f801000)
@@ -261,10 +261,10 @@ void psxMemWrite16(u32 mem, u16 value) {
char *p;
u32 t;
-
- psxRegs.cycle += 2;
-
-
+
+ psxRegs.cycle += 2;
+
+
t = mem >> 16;
if (t == 0x1f80) {
if (mem < 0x1f801000)
@@ -292,10 +292,10 @@ void psxMemWrite32(u32 mem, u32 value) {
char *p;
u32 t;
-
- psxRegs.cycle += 2;
-
-
+
+ psxRegs.cycle += 2;
+
+
// if ((mem&0x1fffff) == 0x71E18 || value == 0x48088800) SysPrintf("t2fix!!\n");
t = mem >> 16;
if (t == 0x1f80) {