Attached patch is to cleanup some unused or obsolete parts from m68k ports. Kiyo --------------------------------------------------------------- diff -cr kaffe-snap/config/m68k/common.h kaffe-snap-0327/config/m68k/common.h *** kaffe-snap/config/m68k/common.h Fri Mar 26 03:06:25 1999 --- kaffe-snap-0327/config/m68k/common.h Sun Mar 28 14:23:59 1999 *************** *** 2,18 **** * m68k/common.h * Common M68K configuration information. * ! * Copyright (c) 1996, 1997, 1998 * Transvirtual Technologies, Inc. All rights reserved. * * See the file "license.terms" for information on usage and redistribution * of this file. * ! * Written by Kiyo Inaba <[EMAIL PROTECTED]>, 1998; * Based on the ports * by Remi Perrot <[EMAIL PROTECTED]> to m68k/linux * and * by Alexandre Oliva <[EMAIL PROTECTED]> to sparc */ #ifndef __m68k_common_h --- 2,21 ---- * m68k/common.h * Common M68K configuration information. * ! * Copyright (c) 1996, 1997, 1998, 1999 * Transvirtual Technologies, Inc. All rights reserved. * * See the file "license.terms" for information on usage and redistribution * of this file. * ! * Written by Kiyo Inaba <[EMAIL PROTECTED]>, 1998; * Based on the ports * by Remi Perrot <[EMAIL PROTECTED]> to m68k/linux * and * by Alexandre Oliva <[EMAIL PROTECTED]> to sparc + * + * Modified by Kiyo Inaba <[EMAIL PROTECTED]>, 1999 to support + * both linux and netbsd1. */ #ifndef __m68k_common_h *************** *** 23,28 **** --- 26,41 ---- */ #define ALIGNMENT_OF_SIZE(S) (((S>1)?2:1)) + /* + * sysdepCallMethod supports: + * + * Calling sequences for linux and netbsd1 are same, except for + * the place of return values. The float/double values are in + * fp0 (linux) or d0/d1 (netbsd1). + * + * Still I do not understand 'asm' statement well, and the + * statement below is a 'because it works' version. + */ #if defined(__linux__) #ifdef USE_ASM /* Old and obsolete... */ #define sysdepCallMethod(CALL) \ diff -cr kaffe-snap/config/m68k/jit.h kaffe-snap-0327/config/m68k/jit.h *** kaffe-snap/config/m68k/jit.h Fri Mar 26 03:06:25 1999 --- kaffe-snap-0327/config/m68k/jit.h Sun Mar 28 14:26:59 1999 *************** *** 7,22 **** * * See the file "license.terms" for information on usage and redistribution * of this file. */ #ifndef __m68k_jit_h #define __m68k_jit_h - - /* - * NOTE: Kiyo Inaba <[EMAIL PROTECTED]> says that this file is - * very specific to m68k/Linux, and moreover, that it's currently broken. - * It should not be considered a common file for m68k JITs at this point. - */ /**/ /* Exception handling information. */ --- 7,19 ---- * * See the file "license.terms" for information on usage and redistribution * of this file. + * + * Modified by Kiyo Inaba <[EMAIL PROTECTED]>, 1999; + * to support the trampoline mechanism. */ #ifndef __m68k_jit_h #define __m68k_jit_h /**/ /* Exception handling information. */ diff -cr kaffe-snap/config/m68k/linux/jit-md.h kaffe-snap-0327/config/m68k/linux/jit-md.h *** kaffe-snap/config/m68k/linux/jit-md.h Fri Mar 26 15:08:51 1999 --- kaffe-snap-0327/config/m68k/linux/jit-md.h Sun Mar 28 14:30:51 1999 *************** *** 1,49 **** /* - * m68k/netbsd1/jit-md.h - * NetBSD m68k JIT configuration information. - * - * Copyright (c) 1996, 1997 - * Transvirtual Technologies, Inc. All rights reserved. - * - * See the file "license.terms" for information on usage and redistribution - * of this file. - * - * Written by Marcello Balduccini <[EMAIL PROTECTED]>, 1997. - * NOTE: this file is heavily based on m68k/a-ux/jit-md.h and - * m68k/openbsd2/jit-md.h, written by Richard Henderson <[EMAIL PROTECTED]>, 1997. - */ - - #ifndef __m68k_netbsd_jit_md_h - #define __m68k_netbsd_jit_md_h - - /**/ - /* Include common information. */ - /**/ - #include "m68k/jit.h" - - /**/ - /* Define where addresses are returned. */ - /**/ - - #define M68K_RETURN_REF REG_d0 /* d0 */ - - /**/ - /* Extra exception handling information. */ - /**/ - #include <signal.h> - - #define EXCEPTIONPROTO \ - int sig, int code, struct sigcontext *ctx - - /* Get the first exception frame from a signal handler */ - #define EXCEPTIONFRAME(f, c) \ - do { \ - (f).retfp = (uintp)__builtin_frame_address(1); \ - (f).retpc = (uintp)(c)->sc_pc; \ - } while (0) - - #endif - /* * m68k/linux/jit-md.h * Linux m68k JIT configuration information. * --- 1,4 ---- diff -cr kaffe-snap/config/m68k/trampolines.c kaffe-snap-0327/config/m68k/trampolines.c *** kaffe-snap/config/m68k/trampolines.c Fri Mar 26 03:06:25 1999 --- kaffe-snap-0327/config/m68k/trampolines.c Sun Mar 28 14:29:46 1999 *************** *** 8,14 **** * See the file "license.terms" for information on usage and redistribution * of this file. * ! * Written by Kiyo Inaba ([EMAIL PROTECTED]) based on i386/trampolines.c */ #if defined(TRAMPOLINE_FUNCTION) --- 8,17 ---- * See the file "license.terms" for information on usage and redistribution * of this file. * ! * Written by Kiyo Inaba <[EMAIL PROTECTED]>, 1998; ! * based on i386/trampolines.c ! * Modified by Kiyo Inaba <[EMAIL PROTECTED]>, 1999; ! * to use linux's assembler syntax to support both linux/netbsd. */ #if defined(TRAMPOLINE_FUNCTION)