cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix totally bogus ## token pasting.

Browse Source
This commit is contained in:
espie 2004-01-02 19:52:15 +00:00
parent fac37e1b49
commit 94af4e78e7
3 changed files with 73 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lang/kaffe/patches/patch-config_i386_trampolines_c Normal file
View File

@ -0,0 +1,47 @@
$OpenBSD: patch-config_i386_trampolines_c,v 1.1 2004/01/02 19:52:15 espie Exp $
--- config/i386/trampolines.c.orig 2004-01-02 20:43:19.000000000 +0100
+++ config/i386/trampolines.c 2004-01-02 20:44:28.000000000 +0100
@@ -33,10 +33,10 @@ TRAMPOLINE_FUNCTION()
asm(
START_ASM_FUNC() C_FUNC_NAME(i386_do_fixup_trampoline) "\n"
-C_FUNC_NAME(i386_do_fixup_trampoline) ": \n
- call " C_FUNC_NAME(soft_fixup_trampoline) " \n
- popl %ecx \n
- jmp *%eax"
+C_FUNC_NAME(i386_do_fixup_trampoline) ": \n"
+" call " C_FUNC_NAME(soft_fixup_trampoline) " \n"
+" popl %ecx \n"
+" jmp *%eax"
END_ASM_FUNC()
);
@@ -48,17 +48,17 @@ C_FUNC_NAME(i386_do_fixup_trampoline) ":
*/
asm(
START_ASM_FUNC() C_FUNC_NAME(__kaffe_i386_gcj_fixup) "\n"
-C_FUNC_NAME(__kaffe_i386_gcj_fixup) ":
- mov (%esp), %eax # get return address
- add -4(%eax), %eax # add jump relative offset from previous instr.
- # this points at at jmp *$off(%ebx) instr.
- mov 2(%eax), %eax # extract 'off'
- add %ebx, %eax # compute $off(%ebx)
- pushl %eax # pass as first argument
- call " C_FUNC_NAME(gcj_fixup_trampoline) " # returns target
- addl $4, %esp # remove argument
- jmp *%eax # jump to target
-"
+C_FUNC_NAME(__kaffe_i386_gcj_fixup) ":\n"
+" mov (%esp), %eax # get return address\n"
+" add -4(%eax), %eax # add jump relative offset from previous instr.\n"
+" # this points at at jmp *$off(%ebx) instr.\n"
+" mov 2(%eax), %eax # extract 'off'\n"
+" add %ebx, %eax # compute $off(%ebx)\n"
+" pushl %eax # pass as first argument\n"
+" call " C_FUNC_NAME(gcj_fixup_trampoline) " # returns target\n"
+" addl $4, %esp # remove argument\n"
+" jmp *%eax # jump to target\n"
+"\n"
END_ASM_FUNC()
);

14
lang/kaffe/patches/patch-kaffe_kaffevm_jit3_machine_h Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-kaffe_kaffevm_jit3_machine_h,v 1.1 2004/01/02 19:52:15 espie Exp $
--- kaffe/kaffevm/jit3/machine.h.orig 2004-01-02 20:42:05.000000000 +0100
+++ kaffe/kaffevm/jit3/machine.h 2004-01-02 20:42:14.000000000 +0100
@@ -148,8 +148,8 @@ typedef struct _nativeCodeInfo {
int codelen;
} nativeCodeInfo;
-#define willCatch(FLAG) willcatch.##FLAG = true
-#define canCatch(FLAG) willcatch.##FLAG
+#define willCatch(FLAG) willcatch.FLAG = true
+#define canCatch(FLAG) willcatch.FLAG
void setupGlobalRegisters(void);
void setupArgumentRegisters(void);

12
lang/kaffe/patches/patch-kaffe_kaffevm_systems_unix-jthreads_jthread_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-kaffe_kaffevm_systems_unix-jthreads_jthread_c,v 1.1 2004/01/02 19:52:15 espie Exp $
--- kaffe/kaffevm/systems/unix-jthreads/jthread.c.orig 2004-01-02 20:45:11.000000000 +0100
+++ kaffe/kaffevm/systems/unix-jthreads/jthread.c 2004-01-02 20:45:33.000000000 +0100
@@ -135,7 +135,7 @@ jthread* currentJThread;
/* A signal context pointer type, used in parameter lists/declarations */
#ifndef SIGNAL_CONTEXT_POINTER
-#define SIGNAL_CONTEXT_POINTER(x) void *##x
+#define SIGNAL_CONTEXT_POINTER(x) void *x
#endif
/* Get the PC from a signal context pointer */