Attachment 81638 Details for Bug 116893 – vba-1.7.2_5.patch

[patch] vba-1.7.2_5.patch

vba-1.7.2_5.patch (text/plain), 2.85 KB, created by Martin Wilke on 2007-10-04 09:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Wilke

Created: 2007-10-04 09:30:01 UTC

Size: 2.85 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/emulators/vba/Makefile,v
>retrieving revision 1.22
>diff -u -u -r1.22 Makefile
>--- Makefile	2 Oct 2007 05:24:15 -0000	1.22
>+++ Makefile	3 Oct 2007 23:03:10 -0000
>@@ -38,10 +38,6 @@
> BROKEN=		Runaway cc1plus process
> .endif
> 
>-.if ${OSVERSION} >= 700042
>-BROKEN=		Does not compile with GCC 4.2
>-.endif
>-
> .ifdef(WITH_GTK2)
> PLIST_SUB=	INSTALL_GTK2=""
> USE_GCC=	3.4+
>Index: files/patch-src-prof_gmon.h
>===================================================================
>RCS file: files/patch-src-prof_gmon.h
>diff -N files/patch-src-prof_gmon.h
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src-prof_gmon.h	3 Oct 2007 23:11:05 -0000
>@@ -0,0 +1,11 @@
>+--- src/prof/gmon.h.orig	2007-10-04 01:06:18.000000000 +0200
>++++ src/prof/gmon.h	2007-10-04 01:06:48.000000000 +0200
>+@@ -119,7 +119,7 @@
>+ 
>+ struct tostruct
>+   {
>+-    char *selfpc;
>++    uint32_t selfpc;
>+     int count;
>+     unsigned short link;
>+   };
>Index: files/patch-src-prof_prof.cpp
>===================================================================
>RCS file: files/patch-src-prof_prof.cpp
>diff -N files/patch-src-prof_prof.cpp
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src-prof_prof.cpp	3 Oct 2007 23:11:12 -0000
>@@ -0,0 +1,20 @@
>+--- 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;
>Index: files/patch-src-sdl_debugger.cpp
>===================================================================
>RCS file: files/patch-src-sdl_debugger.cpp
>diff -N files/patch-src-sdl_debugger.cpp
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src-sdl_debugger.cpp	3 Oct 2007 23:13:05 -0000
>@@ -0,0 +1,14 @@
>+--- 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",

Actions: View | Diff

Attachments on bug 116893: 81638