Skip to content
Permalink
Browse files

Bug: https://trac.macports.org/ticket/1107

Submitted by:   leimy@opendarwin.org (Dave Leimbach)
Reviewed by:
Approved by:
Obtained from:

get bochs working on panther. mostly work from leimy@, some cleaning
done by me.

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@4001 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
Felix Kronlage
Felix Kronlage committed Nov 21, 2003
1 parent 52d617f commit 8eb6421d748f5ebb493d9076cae7ffcf1d7ac61c
Showing with 67 additions and 3 deletions.
  1. +3 −3 emulators/bochs/Portfile
  2. +20 −0 emulators/bochs/files/patch-cdrom_osx
  3. +44 −0 emulators/bochs/files/patch-poly
@@ -1,4 +1,4 @@
# $Id: Portfile,v 1.10 2003/04/05 04:27:42 jpm Exp $
# $Id: Portfile,v 1.11 2003/11/21 07:59:12 fkr Exp $

PortSystem 1.0
name bochs
@@ -23,9 +23,9 @@ master_sites \
http://switch.dl.sourceforge.net/sourceforge/${name}/ \
http://cesnet.dl.sourceforge.net/sourceforge/${name}/
checksums md5 12e591b5cec2e0051e18605483f64678
patchfiles patch-Makefile.in patch-cdrom_osx
patchfiles patch-Makefile.in patch-cdrom_osx patch-poly
post-patch {
set path "${portpath}/${workdir}/${worksrcdir}"
set path "${workpath}/${worksrcdir}"
set data_dir "${prefix}/bochs"

reinplace "s|/usr/local/bochs|${data_dir}|g" "${path}/doc/man/bochs-dlx.1"
@@ -9,3 +9,23 @@
{

mach_port_t masterPort = NULL;
--- iodev/cdrom_osx.cc Sun Nov 2 23:19:20 2003
+++ iodev/cdrom_osx_monkey.cc Sun Nov 2 23:20:19 2003
@@ -118,7 +118,7 @@
// which is true if the media is indeed ejectable. So add property
// to CFDictionary for matching.
CFDictionarySetValue( classesToMatch,
- CFSTR( kIOMediaEjectable ), kCFBooleanTrue );
+ CFSTR(kIOMediaEjectableKey), kCFBooleanTrue );
}
kernResult = IOServiceGetMatchingServices( *masterPort,
classesToMatch, mediaIterator );
@@ -143,7 +143,7 @@
{
CFTypeRef deviceFilePathAsCFString;
deviceFilePathAsCFString = IORegistryEntryCreateCFProperty(
- nextMedia, CFSTR( kIOBSDName ),
+ nextMedia, CFSTR( kIOBSDNameKey ),
kCFAllocatorDefault, 0 );
*deviceFilePath = '\0';
if ( deviceFilePathAsCFString )
@@ -0,0 +1,44 @@
--- fpu/poly.h Fri Oct 5 22:53:46 2001
+++ fpu/poly_monkey.h Sun Nov 2 23:23:20 2003
@@ -114,10 +114,10 @@
}
dest->msw += x2->msw;
#else
- asm volatile ("movl %1,%%edi; movl %2,%%esi;
- movl (%%esi),%%eax; addl %%eax,(%%edi);
- movl 4(%%esi),%%eax; adcl %%eax,4(%%edi);
- movl 8(%%esi),%%eax; adcl %%eax,8(%%edi);"
+ asm volatile ("movl %1,%%edi; movl %2,%%esi;"
+ "movl (%%esi),%%eax; addl %%eax,(%%edi);"
+ "movl 4(%%esi),%%eax; adcl %%eax,4(%%edi);"
+ "movl 8(%%esi),%%eax; adcl %%eax,8(%%edi);"
:"=g" (*dest):"g" (dest), "g" (x2)
:"ax","si","di");
#endif
@@ -168,16 +168,16 @@
/* Note: the constraints in the asm statement didn't always work properly
with gcc 2.5.8. Changing from using edi to using ecx got around the
problem, but keep fingers crossed! */
- asm volatile ("movl %2,%%ecx; movl %3,%%esi;
- movl (%%esi),%%eax; addl %%eax,(%%ecx);
- movl 4(%%esi),%%eax; adcl %%eax,4(%%ecx);
- movl 8(%%esi),%%eax; adcl %%eax,8(%%ecx);
- jnc 0f;
- rcrl 8(%%ecx); rcrl 4(%%ecx); rcrl (%%ecx)
- movl %4,%%ecx; incl (%%ecx)
- movl $1,%%eax; jmp 1f;
- 0: xorl %%eax,%%eax;
- 1:"
+ asm volatile ("movl %2,%%ecx; movl %3,%%esi;"
+ "movl (%%esi),%%eax; addl %%eax,(%%ecx);"
+ "movl 4(%%esi),%%eax; adcl %%eax,4(%%ecx);"
+ "movl 8(%%esi),%%eax; adcl %%eax,8(%%ecx);"
+ " jnc 0f;"
+ "rcrl 8(%%ecx); rcrl 4(%%ecx); rcrl (%%ecx)"
+ ": movl %4,%%ecx; incl (%%ecx)"
+ "movl $1,%%eax; jmp 1f;"
+ "0: xorl %%eax,%%eax;"
+ 1:
:"=g" (*exp), "=g" (*dest)
:"g" (dest), "g" (x2), "g" (exp)
:"cx","si","ax");

0 comments on commit 8eb6421

Please sign in to comment.
You can’t perform that action at this time.