Skip to content
Snippets Groups Projects
Commit f055faed authored by toy's avatar toy
Browse files

Use LinkageEntrySize from internals.h instead of LINKAGE_ENTRY_SIZE.

parent 1aebccef
No related branches found
No related tags found
No related merge requests found
/* x86-arch.c -*- Mode: C; comment-column: 40 -*- /* x86-arch.c -*- Mode: C; comment-column: 40 -*-
* *
* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/x86-arch.c,v 1.18 2002/08/28 13:29:25 pmai Exp $ * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/x86-arch.c,v 1.19 2002/11/02 23:47:28 toy Exp $
* *
*/ */
...@@ -345,13 +345,14 @@ lispobj funcall3(lispobj function, lispobj arg0, lispobj arg1, lispobj arg2) ...@@ -345,13 +345,14 @@ lispobj funcall3(lispobj function, lispobj arg0, lispobj arg1, lispobj arg2)
#ifdef LINKAGE_TABLE #ifdef LINKAGE_TABLE
/* Linkage entry size is 8, for no good reason. */ #ifndef LinkageEntrySize
#define LINKAGE_ENTRY_SIZE 8 #define LinkageEntrySize 8
#endif
void arch_make_linkage_entry(long linkage_entry, void *target_addr, long type) void arch_make_linkage_entry(long linkage_entry, void *target_addr, long type)
{ {
char *reloc_addr = (char *)(FOREIGN_LINKAGE_SPACE_START char *reloc_addr = (char *)(FOREIGN_LINKAGE_SPACE_START
+ linkage_entry * LINKAGE_ENTRY_SIZE); + linkage_entry * LinkageEntrySize);
if (type == 1) { /* code reference */ if (type == 1) { /* code reference */
/* Make JMP to function entry. */ /* Make JMP to function entry. */
...@@ -376,7 +377,7 @@ void arch_make_linkage_entry(long linkage_entry, void *target_addr, long type) ...@@ -376,7 +377,7 @@ void arch_make_linkage_entry(long linkage_entry, void *target_addr, long type)
void arch_make_lazy_linkage(long linkage_entry) void arch_make_lazy_linkage(long linkage_entry)
{ {
char *reloc_addr = (char *)(FOREIGN_LINKAGE_SPACE_START char *reloc_addr = (char *)(FOREIGN_LINKAGE_SPACE_START
+ linkage_entry * LINKAGE_ENTRY_SIZE); + linkage_entry * LinkageEntrySize);
long offset = (char *)(FOREIGN_LINKAGE_SPACE_START) - (reloc_addr + 5); long offset = (char *)(FOREIGN_LINKAGE_SPACE_START) - (reloc_addr + 5);
int i; int i;
...@@ -395,6 +396,6 @@ void arch_make_lazy_linkage(long linkage_entry) ...@@ -395,6 +396,6 @@ void arch_make_lazy_linkage(long linkage_entry)
long arch_linkage_entry(unsigned long retaddr) long arch_linkage_entry(unsigned long retaddr)
{ {
return ((retaddr - 5) - FOREIGN_LINKAGE_SPACE_START) / LINKAGE_ENTRY_SIZE; return ((retaddr - 5) - FOREIGN_LINKAGE_SPACE_START) / LinkageEntrySize;
} }
#endif /* LINKAGE_TABLE */ #endif /* LINKAGE_TABLE */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment