[Vm-dev] [commit][3543]
Fix external declarations in the processor alien plugin headers.
commits at squeakvm.org
commits at squeakvm.org
Thu Dec 17 00:52:48 UTC 2015
Revision: 3543
Author: eliot
Date: 2015-12-16 16:52:47 -0800 (Wed, 16 Dec 2015)
Log Message:
-----------
Fix external declarations in the processor alien plugin headers. Have the support
.cpp files use longs instead of ints, for 64-bits benefit.
Modified Paths:
--------------
trunk/platforms/Cross/plugins/BochsIA32Plugin/BochsIA32Plugin.h
trunk/platforms/Cross/plugins/BochsIA32Plugin/sqBochsIA32Plugin.cpp
trunk/platforms/Cross/plugins/BochsX64Plugin/BochsX64Plugin.h
trunk/platforms/Cross/plugins/BochsX64Plugin/sqBochsX64Plugin.cpp
trunk/platforms/Cross/plugins/GdbARMPlugin/GdbARMPlugin.h
trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile
trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.unix
trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c
Property Changed:
----------------
trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h
Modified: trunk/platforms/Cross/plugins/BochsIA32Plugin/BochsIA32Plugin.h
===================================================================
--- trunk/platforms/Cross/plugins/BochsIA32Plugin/BochsIA32Plugin.h 2015-12-17 00:51:26 UTC (rev 3542)
+++ trunk/platforms/Cross/plugins/BochsIA32Plugin/BochsIA32Plugin.h 2015-12-17 00:52:47 UTC (rev 3543)
@@ -14,48 +14,48 @@
#endif
/*
- * Answer a pointer to a new Bochs IA32 CPU (an instance of C++ class bx_cpu_c)
+ * Answer a polonger to a new Bochs IA32 CPU (an instance of C++ class bx_cpu_c)
*/
extern void *newCPU();
/*
* reset the cpu to register contents 0, protected 32-bit mode.
*/
-extern int resetCPU(void *cpu);
+extern long resetCPU(void *cpu);
/*
* Single-step *cpu (a bx_cpu_c instance) using memory as its memory.
- * Answer 0 on success, or an integer error code if something went awry.
+ * Answer 0 on success, or an longeger error code if something went awry.
*/
-extern int singleStepCPUInSizeMinAddrReadWrite(void *cpu, void *memory,
+extern long singleStepCPUInSizeMinAddressReadWrite(void *cpu, void *memory,
ulong byteSize, ulong minReadAddr, ulong minWriteAddr);
/*
* Run *cpu (a bx_cpu_c instance) using memory as its memory.
- * Answer an integer error code when the processor hits some exception.
- * Answer 0 when it is interrupted.
+ * Answer an longeger error code when the processor hits some exception.
+ * Answer 0 when it is longerrupted.
*/
-extern int runCPUInSizeMinAddrReadWrite(void *cpu, void *memory,
+extern long runCPUInSizeMinAddressReadWrite(void *cpu, void *memory,
ulong byteSize, ulong minReadAddr, ulong minWriteAddr);
/*
* Flush any icache entries from start to end
*/
extern void flushICacheFromTo(void *cpu, ulong strt, ulong nd);
/*
- * force runCPUInSize to exit asap. Used by interrupts.
+ * force runCPUInSize to exit asap. Used by longerrupts.
*/
extern void forceStopRunning(void);
/*
- * The previous entry in the interruptCheckChain so forceStopRunning can chain.
+ * The previous entry in the longerruptCheckChain so forceStopRunning can chain.
*/
extern void (*prevInterruptCheckChain)();
/*
* Disassemble the instruction at address in memory, writing the output to the
* log.
*/
-extern int disassembleForAtInSize(void *cpu, ulong laddr,
+extern long disassembleForAtInSize(void *cpu, ulong laddr,
void *memory, ulong byteSize);
/*
* The saved error if the previous singleStepIn failed.
*/
-extern int errorAcorn();
+extern long errorAcorn();
/*
* The current log (if singleStep failed with SomethingLoggedError).
*/
Modified: trunk/platforms/Cross/plugins/BochsIA32Plugin/sqBochsIA32Plugin.cpp
===================================================================
--- trunk/platforms/Cross/plugins/BochsIA32Plugin/sqBochsIA32Plugin.cpp 2015-12-17 00:51:26 UTC (rev 3542)
+++ trunk/platforms/Cross/plugins/BochsIA32Plugin/sqBochsIA32Plugin.cpp 2015-12-17 00:52:47 UTC (rev 3543)
@@ -38,7 +38,7 @@
static bx_address last_read_address = (bx_address)-1; /* for RMW cycles */
void (*prevInterruptCheckChain)() = 0;
- int resetCPU(void *cpu);
+ long resetCPU(void *cpu);
void *
newCPU()
@@ -50,7 +50,7 @@
return &bx_cpu;
}
- int
+ long
resetCPU(void *cpu)
{
BX_CPU_C *anx86 = (BX_CPU_C *)cpu;
@@ -91,7 +91,7 @@
return 0;
}
- int
+ long
singleStepCPUInSizeMinAddressReadWrite(void *cpu,
void *memory, ulong byteSize,
ulong minAddr, ulong minWriteMaxExecAddr)
@@ -124,7 +124,7 @@
return blidx == 0 ? 0 : SomethingLoggedError;
}
- int
+ long
runCPUInSizeMinAddressReadWrite(void *cpu, void *memory, ulong byteSize,
ulong minAddr, ulong minWriteMaxExecAddr)
{
@@ -173,7 +173,7 @@
#endif
}
- int
+ long
disassembleForAtInSize(void *cpu, ulong laddr,
void *memory, ulong byteSize)
{
@@ -224,7 +224,7 @@
bx_cpu.async_event = 1;
}
- int
+ long
errorAcorn(void) { return theErrorAcorn; }
char *
Modified: trunk/platforms/Cross/plugins/BochsX64Plugin/BochsX64Plugin.h
===================================================================
--- trunk/platforms/Cross/plugins/BochsX64Plugin/BochsX64Plugin.h 2015-12-17 00:51:26 UTC (rev 3542)
+++ trunk/platforms/Cross/plugins/BochsX64Plugin/BochsX64Plugin.h 2015-12-17 00:52:47 UTC (rev 3543)
@@ -21,19 +21,19 @@
/*
* reset the cpu to register contents 0, protected 64-bit mode.
*/
-extern int resetCPU(void *cpu);
+extern long resetCPU(void *cpu);
/*
* Single-step *cpu (a bx_cpu_c instance) using memory as its memory.
* Answer 0 on success, or an integer error code if something went awry.
*/
-extern int singleStepCPUInSizeMinAddrReadWrite(void *cpu, void *memory,
+extern long singleStepCPUInSizeMinAddressReadWrite(void *cpu, void *memory,
ulong byteSize, ulong minReadAddr, ulong minWriteAddr);
/*
* Run *cpu (a bx_cpu_c instance) using memory as its memory.
* Answer an integer error code when the processor hits some exception.
* Answer 0 when it is interrupted.
*/
-extern int runCPUInSizeMinAddrReadWrite(void *cpu, void *memory,
+extern long runCPUInSizeMinAddressReadWrite(void *cpu, void *memory,
ulong byteSize, ulong minReadAddr, ulong minWriteAddr);
/*
* Flush any icache entries from start to end
@@ -51,12 +51,12 @@
* Disassemble the instruction at address in memory, writing the output to the
* log.
*/
-extern int disassembleForAtInSize(void *cpu, ulong laddr,
+extern long disassembleForAtInSize(void *cpu, ulong laddr,
void *memory, ulong byteSize);
/*
* The saved error if the previous singleStepIn failed.
*/
-extern int errorAcorn();
+extern long errorAcorn();
/*
* The current log (if singleStep failed with SomethingLoggedError).
*/
Modified: trunk/platforms/Cross/plugins/BochsX64Plugin/sqBochsX64Plugin.cpp
===================================================================
--- trunk/platforms/Cross/plugins/BochsX64Plugin/sqBochsX64Plugin.cpp 2015-12-17 00:51:26 UTC (rev 3542)
+++ trunk/platforms/Cross/plugins/BochsX64Plugin/sqBochsX64Plugin.cpp 2015-12-17 00:52:47 UTC (rev 3543)
@@ -38,7 +38,7 @@
static bx_address last_read_address = (bx_address)-1; /* for RMW cycles */
void (*prevInterruptCheckChain)() = 0;
- int resetCPU(void *cpu);
+ long resetCPU(void *cpu);
void *
newCPU()
@@ -50,7 +50,7 @@
return &bx_cpu;
}
- int
+ long
resetCPU(void *cpu)
{
BX_CPU_C *anx64 = (BX_CPU_C *)cpu;
@@ -105,7 +105,7 @@
: InitializationError;
}
- int
+ long
singleStepCPUInSizeMinAddressReadWrite(void *cpu,
void *memory, ulong byteSize,
ulong minAddr, ulong minWriteMaxExecAddr)
@@ -138,7 +138,7 @@
return blidx == 0 ? 0 : SomethingLoggedError;
}
- int
+ long
runCPUInSizeMinAddressReadWrite(void *cpu, void *memory, ulong byteSize,
ulong minAddr, ulong minWriteMaxExecAddr)
{
@@ -187,7 +187,7 @@
#endif
}
- int
+ long
disassembleForAtInSize(void *cpu, ulong laddr,
void *memory, ulong byteSize)
{
@@ -238,7 +238,7 @@
bx_cpu.async_event = 1;
}
- int
+ long
errorAcorn(void) { return theErrorAcorn; }
char *
Modified: trunk/platforms/Cross/plugins/GdbARMPlugin/GdbARMPlugin.h
===================================================================
--- trunk/platforms/Cross/plugins/GdbARMPlugin/GdbARMPlugin.h 2015-12-17 00:51:26 UTC (rev 3542)
+++ trunk/platforms/Cross/plugins/GdbARMPlugin/GdbARMPlugin.h 2015-12-17 00:52:47 UTC (rev 3543)
@@ -22,52 +22,52 @@
#endif
extern ulong minReadAddress, minWriteAddress;
-extern int gdb_log_printf(void* stream, const char * format, ...);
+extern long gdb_log_printf(void* stream, const char * format, ...);
/*
- * Answer a pointer to a new ARMulator CPU (an instance of typedef ARMul_State)
+ * Answer a polonger to a new ARMulator CPU (an instance of typedef ARMul_State)
*/
extern void *newCPU();
/*
* reset the cpu to register contents 0, protected 32-bit mode.
*/
-extern int resetCPU(void *cpu);
+extern long resetCPU(void *cpu);
/*
* Single-step *cpu (an ARMul_state instance) using memory as its memory.
- * Answer 0 on success, or an integer error code if something went awry.
+ * Answer 0 on success, or an longeger error code if something went awry.
*/
-extern int singleStepCPUInSizeMinAddrReadWrite(void *cpu, void *memory,
+extern long singleStepCPUInSizeMinAddressReadWrite(void *cpu, void *memory,
ulong byteSize, ulong minReadAddr, ulong minWriteAddr);
/*
* Run *cpu (an ARMul_state instance) using memory as its memory.
- * Answer an integer error code when the processor hits some exception.
- * Answer 0 when it is interrupted.
+ * Answer an longeger error code when the processor hits some exception.
+ * Answer 0 when it is longerrupted.
*/
-extern int runCPUInSizeMinAddrReadWrite(void *cpu, void *memory,
+extern long runCPUInSizeMinAddressReadWrite(void *cpu, void *memory,
ulong byteSize, ulong minReadAddr, ulong minWriteAddr);
/*
* Flush any icache entries from start to end
*/
extern void flushICacheFromTo(void *cpu, ulong strt, ulong nd);
/*
- * force runCPUInSize to exit asap. Used by interrupts.
+ * force runCPUInSize to exit asap. Used by longerrupts.
*/
extern void forceStopRunning();
/*
- * The previous entry in the interruptCheckChain so forceStopRunning can chain.
+ * The previous entry in the longerruptCheckChain so forceStopRunning can chain.
*/
extern void (*prevInterruptCheckChain)();
/*
* Disassemble the instruction at address in memory, writing the output to the
* log.
*/
-extern int disassembleForAtInSize(void *cpu, ulong laddr,
+extern long disassembleForAtInSize(void *cpu, ulong laddr,
void *memory, ulong byteSize);
/*
* The saved error if the previous singleStepIn failed.
*/
-extern int errorAcorn();
+extern long errorAcorn();
/*
* The current log (if singleStep failed with SomethingLoggedError).
*/
Modified: trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile
===================================================================
--- trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile 2015-12-17 00:51:26 UTC (rev 3542)
+++ trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile 2015-12-17 00:52:47 UTC (rev 3543)
@@ -1,6 +1,6 @@
# edit this to suit your system; it really ought to use relative paths
# or some other convenience
-GDBBUILDFOLDER = /home/tim/Documents/Raspbian-Cog/gdb-arm/gdb-7.6
+GDBBUILDFOLDER = /home/tim/Documents/Raspbian-Cog/gdb-arm/gdb-7.10
CC = gcc
CFLAGS = -I$(GBDBUILDFOLDER)/bfd
Modified: trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.unix
===================================================================
--- trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.unix 2015-12-17 00:51:26 UTC (rev 3542)
+++ trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.unix 2015-12-17 00:52:47 UTC (rev 3543)
@@ -1,6 +1,6 @@
# edit this to suit your system; it really ought to use relative paths
# or some other convenience
-GDBBUILDFOLDER = /home/tim/Documents/Raspbian-Cog/gdb-arm/gdb-7.6
+GDBBUILDFOLDER = /home/tim/Documents/Raspbian-Cog/gdb-arm/gdb-7.10
XCFLAGS = -m32 -DNEED_UI_LOOP_HOOK
XINCLUDES += -I$(GDBBUILDFOLDER)/sim/arm
Modified: trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c
===================================================================
--- trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c 2015-12-17 00:51:26 UTC (rev 3542)
+++ trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c 2015-12-17 00:52:47 UTC (rev 3543)
@@ -51,7 +51,7 @@
return lastCPU;
}
-int
+long
resetCPU(void* cpu)
{
unsigned int i, j;
@@ -74,7 +74,7 @@
return 0;
}
-int
+long
runOnCPU(void *cpu, void *memory,
ulong byteSize, ulong minAddr, ulong minWriteMaxExecAddr, ARMword (*run)(ARMul_State*))
{
@@ -104,14 +104,14 @@
return gdblog_index == 0 ? 0 : SomethingLoggedError;
}
-int
+long
singleStepCPUInSizeMinAddressReadWrite(void *cpu, void *memory,
ulong byteSize, ulong minAddr, ulong minWriteMaxExecAddr)
{
return runOnCPU(cpu, memory, byteSize, minAddr, minWriteMaxExecAddr, ARMul_DoInstr);
}
-int
+long
runCPUInSizeMinAddressReadWrite(void *cpu, void *memory,
ulong byteSize, ulong minAddr, ulong minWriteMaxExecAddr)
{
@@ -129,7 +129,7 @@
#endif
}
-int
+long
gdb_log_printf(void* stream, const char * format, ...)
{
va_list arg;
@@ -145,7 +145,7 @@
return 0;
}
-int
+long
disassembleForAtInSize(void *cpu, ulong laddr,
void *memory, ulong byteSize)
{
@@ -185,7 +185,7 @@
lastCPU->Emulate = STOP;
}
-int
+long
errorAcorn(void) { return 0; }
char *
Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Sun Dec 13 17:59:36 PST 2015
+ Wed Dec 16 16:51:42 PST 2015
More information about the Vm-dev
mailing list