[kaffe] Re: [cygwin] Next set of patches

[Davanum Srinivas]

Anyone else waiting for the win32 port? 

--- Davanum Srinivas <dims at yahoo.com> wrote:

> Here's the cleaned up patch for trampoline.S and md.h
> 
> Index: config/i386/trampolines.S
> ===================================================================
> RCS file: /cvs/kaffe/kaffe/config/i386/trampolines.S,v
> retrieving revision 1.1
> diff -u -r1.1 trampolines.S
> --- config/i386/trampolines.S	16 Mar 2005 10:30:56 -0000	1.1
> +++ config/i386/trampolines.S	20 May 2005 18:52:51 -0000
> @@ -20,13 +20,15 @@
>  TRAMPOLINE_FUNCTION()
>  
>  #else
> -/*
> - * Otherwise we'll try to construct one.
> - */
> -#if defined(HAVE_UNDERSCORED_C_NAMES)
> -#define	C_FUNC_NAME(FUNC) _FUNC
> -#else
> -#define	C_FUNC_NAME(FUNC) FUNC
> +/*
> + * Otherwise we'll try to construct one.
> + */
> +#if !defined(C_FUNC_NAME)
> +#if defined(HAVE_UNDERSCORED_C_NAMES)
> +#define C_FUNC_NAME(FUNC) _ ## FUNC
> +#else
> +#define C_FUNC_NAME(FUNC) FUNC
> +#endif
>  #endif
>  
>       .text
> @@ -38,7 +40,7 @@
>  	push	%ebp
>  	mov	%esp,%ebp
>  	push	%eax
> -	call	C_FUNC_NAME(soft_fixup_trampoline)
> +	call	C_FUNC_NAME(soft_fixup_trampoline)
>  	leave
>  	jmp	*%eax
>  
> Index: config/i386/win32/md.h
> ===================================================================
> RCS file: /cvs/kaffe/kaffe/config/i386/win32/md.h,v
> retrieving revision 1.3
> diff -u -r1.3 md.h
> --- config/i386/win32/md.h	11 Dec 2003 17:56:25 -0000	1.3
> +++ config/i386/win32/md.h	20 May 2005 18:52:52 -0000
> @@ -33,8 +33,10 @@
>  #if defined(TRANSLATOR)
>  #include "jit-md.h"
>  #endif
> -
> +
> +#ifndef __CYGWIN__
>  #define	TRAMPOLINE_FUNCTION()	/* Provided by WIN32-MD.ASM */
> +#endif
>  
>  extern void _sysdepCallMethod(void*);
>  
> Thanks,
> dims
> 
> 
> --- Davanum Srinivas <dims at yahoo.com> wrote:
> > A bit more progress, here's the patch, note that it may be better to use appropriate ifdef's
> for
> > the md.h and trampolines.S files to make it clean/neat.
> > 
> > -- dims
> > 
> > Index: config/i386/trampolines.S
> > ===================================================================
> > RCS file: /cvs/kaffe/kaffe/config/i386/trampolines.S,v
> > retrieving revision 1.1
> > diff -u -r1.1 trampolines.S
> > --- config/i386/trampolines.S   16 Mar 2005 10:30:56 -0000      1.1
> > +++ config/i386/trampolines.S   18 May 2005 21:42:52 -0000
> > @@ -20,25 +20,28 @@
> >  TRAMPOLINE_FUNCTION()
> > 
> >  #else
> > -/*
> > - * Otherwise we'll try to construct one.
> > - */
> > -#if defined(HAVE_UNDERSCORED_C_NAMES)
> > -#define        C_FUNC_NAME(FUNC) _FUNC
> > -#else
> > -#define        C_FUNC_NAME(FUNC) FUNC
> > +/*
> > + * Otherwise we'll try to construct one.
> > + */
> > +#if !defined(C_FUNC_NAME)
> > +#if defined(HAVE_UNDERSCORED_C_NAMES)
> > +#define C_FUNC_NAME(FUNC) _FUNC
> > +#else
> > +#define C_FUNC_NAME(FUNC) FUNC
> > +#endif
> >  #endif
> > 
> >       .text
> >       .align 4
> > -     .globl C_FUNC_NAME(i386_do_fixup_trampoline)
> > +     .globl _i386_do_fixup_trampoline
> > 
> > -     C_FUNC_NAME(i386_do_fixup_trampoline) :
> > +     _i386_do_fixup_trampoline :
> >          popl   %eax
> >         push    %ebp
> >         mov     %esp,%ebp
> >         push    %eax
> > -       call    C_FUNC_NAME(soft_fixup_trampoline)
> > +#      call    C_FUNC_NAME(soft_fixup_trampoline)
> > +    call       _soft_fixup_trampoline
> >         leave
> >         jmp     *%eax
> > 
> > Index: config/i386/win32/md.h
> > ===================================================================
> > RCS file: /cvs/kaffe/kaffe/config/i386/win32/md.h,v
> > retrieving revision 1.3
> > diff -u -r1.3 md.h
> > --- config/i386/win32/md.h      11 Dec 2003 17:56:25 -0000      1.3
> > +++ config/i386/win32/md.h      18 May 2005 21:42:52 -0000
> > @@ -34,7 +34,7 @@
> >  #include "jit-md.h"
> >  #endif
> > 
> > -#define        TRAMPOLINE_FUNCTION()   /* Provided by WIN32-MD.ASM */
> > +//#define      TRAMPOLINE_FUNCTION()   /* Provided by WIN32-MD.ASM */
> > 
> >  extern void _sysdepCallMethod(void*);
> > 
> > Index: libraries/clib/native/ZipFile.c
> > ===================================================================
> > RCS file: /cvs/kaffe/kaffe/libraries/clib/native/ZipFile.c,v
> > retrieving revision 1.24
> > diff -u -r1.24 ZipFile.c
> > --- libraries/clib/native/ZipFile.c     20 Dec 2004 03:40:03 -0000      1.24
> > +++ libraries/clib/native/ZipFile.c     18 May 2005 21:42:55 -0000
> > @@ -43,7 +43,7 @@
> >         closeJarFile((jarFile*)zip);
> >  }
> > 
> > -int
> > +jint
> >  java_util_zip_ZipFile_getZipFileSize0(struct Hkaffe_util_Ptr* zip)
> >  {
> >         return ((jarFile*)zip)->count;
> > 
> > 
> > Davanum Srinivas - http://webservices.apache.org/~dims/
> > 
> > 
> > 		
> > __________________________________ 
> > Do you Yahoo!? 
> > Yahoo! Mail - Find what you need with new enhanced search. 
> > http://info.mail.yahoo.com/mail_250
> > 
> 
> Davanum Srinivas - http://webservices.apache.org/~dims/
> 
> __________________________________________________
> Do You Yahoo!?
> Tired of spam?  Yahoo! Mail has the best spam protection around 
> http://mail.yahoo.com 
> 


Davanum Srinivas - http://webservices.apache.org/~dims/

__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com