Attachment #81638 for bug #116893

View | Details | Raw Unified | Return to bug 116893
Collapse All | Expand All

Lines 38-47 Link Here

(-)Makefile (-4 lines)
38	BROKEN= Runaway cc1plus process	38	BROKEN= Runaway cc1plus process
39	.endif	39	.endif
40		40
41	.if ${OSVERSION} >= 700042
42	BROKEN= Does not compile with GCC 4.2
43	.endif
44
45	.ifdef(WITH_GTK2)	41	.ifdef(WITH_GTK2)
46	PLIST_SUB= INSTALL_GTK2=""	42	PLIST_SUB= INSTALL_GTK2=""
47	USE_GCC= 3.4+	43	USE_GCC= 3.4+

Added Link Here

(-)files/patch-src-prof_gmon.h (+11 lines)
1	--- src/prof/gmon.h.orig 2007-10-04 01:06:18.000000000 +0200
2	+++ src/prof/gmon.h 2007-10-04 01:06:48.000000000 +0200
3	@@ -119,7 +119,7 @@
4
5	struct tostruct
6	{
7	- char *selfpc;
8	+ uint32_t selfpc;
9	int count;
10	unsigned short link;
11	};




--- src/prof/prof.cpp.orig	2007-10-04 01:07:54.000000000 +0200
+++ src/prof/prof.cpp	2007-10-04 01:08:31.000000000 +0200
@@ -279,7 +279,7 @@
 
 void profCount()
 {
-  register char *selfpc;
+  register u32 selfpc;
   register unsigned short *frompcindex;
   register struct tostruct *top;
   register struct tostruct *prevtop;
@@ -292,7 +292,7 @@
   
   /* selfpc = pc pushed by mcount call.
      This identifies the function that was just entered.  */
-  selfpc = (char *) reg[14].I;
+  selfpc = (u32) reg[14].I;
   /* frompcindex = pc in preceding frame.
      This identifies the caller of the function just entered.  */
   frompcindex = (unsigned short *) reg[12].I;




--- src/sdl/debugger.cpp.orig	2007-10-04 01:11:33.000000000 +0200
+++ src/sdl/debugger.cpp	2007-10-04 01:12:22.000000000 +0200
@@ -950,9 +950,9 @@
 {
   u32 address = 0;
   if(mem >= (u32*)&workRAM[0] && mem <= (u32*)&workRAM[0x3ffff])
-    address = 0x2000000 + ((u32)mem - (u32)&workRAM[0]);
+    address = 0x2000000 + (u32)((u8 *)mem - &workRAM[0]);
   else
-    address = 0x3000000 + ((u32)mem - (u32)&internalRAM[0]);
+    address = 0x3000000 + (u32)((u8 *)mem - &internalRAM[0]);
 
   if(size == 2)
     printf("Breakpoint (on write) address %08x old:%08x new:%08x\n", 

Return to bug 116893

Added Link Here

(-)files/patch-src-prof_prof.cpp (+20 lines)
1	--- src/prof/prof.cpp.orig 2007-10-04 01:07:54.000000000 +0200
2	+++ src/prof/prof.cpp 2007-10-04 01:08:31.000000000 +0200
3	@@ -279,7 +279,7 @@
4
5	void profCount()
6	{
7	- register char *selfpc;
8	+ register u32 selfpc;
9	register unsigned short *frompcindex;
10	register struct tostruct *top;
11	register struct tostruct *prevtop;
12	@@ -292,7 +292,7 @@
13
14	/* selfpc = pc pushed by mcount call.
15	This identifies the function that was just entered. */
16	- selfpc = (char *) reg[14].I;
17	+ selfpc = (u32) reg[14].I;
18	/* frompcindex = pc in preceding frame.
19	This identifies the caller of the function just entered. */
20	frompcindex = (unsigned short *) reg[12].I;

Added Link Here

(-)files/patch-src-sdl_debugger.cpp (+14 lines)
1	--- src/sdl/debugger.cpp.orig 2007-10-04 01:11:33.000000000 +0200
2	+++ src/sdl/debugger.cpp 2007-10-04 01:12:22.000000000 +0200
3	@@ -950,9 +950,9 @@
4	{
5	u32 address = 0;
6	if(mem >= (u32)&workRAM[0] && mem <= (u32)&workRAM[0x3ffff])
7	- address = 0x2000000 + ((u32)mem - (u32)&workRAM[0]);
8	+ address = 0x2000000 + (u32)((u8 *)mem - &workRAM[0]);
9	else
10	- address = 0x3000000 + ((u32)mem - (u32)&internalRAM[0]);
11	+ address = 0x3000000 + (u32)((u8 *)mem - &internalRAM[0]);
12
13	if(size == 2)
14	printf("Breakpoint (on write) address %08x old:%08x new:%08x\n",