Lua: add memory.registerread()

Author: gochaism

src/common/lua-engine.cpp

@@ -4457,7 +4457,7 @@ static const struct luaL_reg memorylib[] = {
 
 	// memory hooks
 	{ "registerwrite",	   memory_registerwrite			 },
-	//{"registerread", memory_registerread},
+	{ "registerread",	   memory_registerread			 },
 	{ "registerexec",	   memory_registerexec			 },
 	// alternate names
 	{ "register",		   memory_registerwrite			 },

src/gb/V7/GB.cpp

@@ -1280,7 +1280,7 @@ void gbWriteMemory(register u16 address, register u8 value)
 	CallRegisteredLuaMemHook(address, 1, value, LUAMEMHOOK_WRITE);
 }
 
-u8 gbReadMemory(register u16 address)
+u8 gbReadMemoryWrapped(register u16 address)
 {
 	if (gbCheatMap[address])
 		return gbCheatRead(address);
@@ -1459,6 +1459,13 @@ u8 gbReadMemory(register u16 address)
 	return gbReadMemoryQuick(address);
 }
 
+u8 gbReadMemory(register u16 address)
+{
+	u8 value = gbReadMemoryWrapped(address);
+	CallRegisteredLuaMemHook(address, 1, value, LUAMEMHOOK_READ);
+	return value;
+}
+
 void gbVblank_interrupt()
 {
 	if (IFF & 0x80)

src/gb/V8/GB.cpp

@@ -1839,7 +1839,7 @@ u8 gbReadOpcode(register u16 address)
 	return gbMemoryMap[address >> 12][address & 0x0fff];
 }
 
-u8 gbReadMemory(register u16 address)
+u8 gbReadMemoryWrapped(register u16 address)
 {
 	if (gbCheatMap[address])
 		return gbCheatRead(address);
@@ -2134,6 +2134,13 @@ u8 gbReadMemory(register u16 address)
 	return gbMemoryMap[address >> 12][address & 0x0fff];
 }
 
+u8 gbReadMemory(register u16 address)
+{
+	u8 value = gbReadMemoryWrapped(address);
+	CallRegisteredLuaMemHook(address, 1, value, LUAMEMHOOK_READ);
+	return value;
+}
+
 void gbVblank_interrupt()
 {
 	gbCheatWrite(false); // Emulates GS codes.

src/gba/V7/GBAMemory.cpp

@@ -32,7 +32,7 @@ extern int32 cpuDmaCount;
 
 MemoryMap memoryMap[256];
 
-u32 CPUReadMemory(u32 address)
+u32 CPUReadMemoryWrapped(u32 address)
 {
 #ifdef GBA_LOGGING
 	if (address & 3)
@@ -171,7 +171,7 @@ u32 CPUReadMemory(u32 address)
 	return value;
 }
 
-u32 CPUReadHalfWord(u32 address)
+u32 CPUReadHalfWordWrapped(u32 address)
 {
 #ifdef GBA_LOGGING
 	if (address & 1)
@@ -292,15 +292,15 @@ u32 CPUReadHalfWord(u32 address)
 	return value;
 }
 
-u16 CPUReadHalfWordSigned(u32 address)
+u16 CPUReadHalfWordSignedWrapped(u32 address)
 {
 	u16 value = CPUReadHalfWord(address);
 	if ((address & 1))
 		value = (s8)value;
 	return value;
 }
 
-u8 CPUReadByte(u32 address)
+u8 CPUReadByteWrapped(u32 address)
 {
 	switch (address >> 24)
 	{
@@ -723,3 +723,31 @@ void CPUWriteByte(u32 address, u8 b)
 	CPUWriteByteWrapped(address, b);
 	CallRegisteredLuaMemHook(address, 1, b, LUAMEMHOOK_WRITE);
 }
+
+u32 CPUReadMemory(u32 address)
+{
+	u32 value = CPUReadMemoryWrapped(address);
+	CallRegisteredLuaMemHook(address, 4, value, LUAMEMHOOK_READ);
+	return value;
+}
+
+u32 CPUReadHalfWord(u32 address)
+{
+	u32 value = CPUReadHalfWordWrapped(address);
+	CallRegisteredLuaMemHook(address, 4, value, LUAMEMHOOK_READ);
+	return value;
+}
+
+u16 CPUReadHalfWordSigned(u32 address)
+{
+	u16 value = CPUReadHalfWordSignedWrapped(address);
+	CallRegisteredLuaMemHook(address, 2, value, LUAMEMHOOK_READ);
+	return value;
+}
+
+u8 CPUReadByte(u32 address)
+{
+	u8 value = CPUReadByteWrapped(address);
+	CallRegisteredLuaMemHook(address, 1, value, LUAMEMHOOK_READ);
+	return value;
+}

src/gba/V8/GBAMemory.cpp

@@ -121,7 +121,7 @@ extern const u32 objTilesAddress[3];
 
 MemoryMap memoryMap[256];
 
-u32 CPUReadMemory(u32 address)
+u32 CPUReadMemoryWrapped(u32 address)
 {
 #ifdef GBA_LOGGING
 	if (address & 3)
@@ -270,7 +270,7 @@ u32 CPUReadMemory(u32 address)
 	return value;
 }
 
-u32 CPUReadHalfWord(u32 address)
+u32 CPUReadHalfWordWrapped(u32 address)
 {
 #ifdef GBA_LOGGING
 	if (address & 1)
@@ -409,15 +409,15 @@ u32 CPUReadHalfWord(u32 address)
 	return value;
 }
 
-u16 CPUReadHalfWordSigned(u32 address)
+u16 CPUReadHalfWordSignedWrapped(u32 address)
 {
 	u16 value = CPUReadHalfWord(address);
 	if ((address & 1))
 		value = (s8)value;
 	return value;
 }
 
-u8 CPUReadByte(u32 address)
+u8 CPUReadByteWrapped(u32 address)
 {
 	switch (address >> 24)
 	{
@@ -918,3 +918,31 @@ void CPUWriteByte(u32 address, u8 b)
 	CPUWriteByteWrapped(address, b);
 	CallRegisteredLuaMemHook(address, 1, b, LUAMEMHOOK_WRITE);
 }
+
+u32 CPUReadMemory(u32 address)
+{
+	u32 value = CPUReadMemoryWrapped(address);
+	CallRegisteredLuaMemHook(address, 4, value, LUAMEMHOOK_READ);
+	return value;
+}
+
+u32 CPUReadHalfWord(u32 address)
+{
+	u32 value = CPUReadHalfWordWrapped(address);
+	CallRegisteredLuaMemHook(address, 4, value, LUAMEMHOOK_READ);
+	return value;
+}
+
+u16 CPUReadHalfWordSigned(u32 address)
+{
+	u16 value = CPUReadHalfWordSignedWrapped(address);
+	CallRegisteredLuaMemHook(address, 2, value, LUAMEMHOOK_READ);
+	return value;
+}
+
+u8 CPUReadByte(u32 address)
+{
+	u8 value = CPUReadByteWrapped(address);
+	CallRegisteredLuaMemHook(address, 1, value, LUAMEMHOOK_READ);
+	return value;
+}