mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 20:00:19 +02:00
Code Activity

Rename DT_GUILE_VM_VERSION.

Browse source 
* libguile/objcodes.c (DT_GUILE_VM_VERSION, process_dynamic_segment):
* module/system/vm/elf.scm (DT_GUILE_VM_VERSION): Rename from
  DT_GUILE_RTL_VERSION.
* module/system/vm/assembler.scm (link-dynamic-section): Adapt.
This commit is contained in:
Andy Wingo 2013-11-19 20:02:15 +01:00
parent 6b9470bf48
commit 8bf83893c7
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libguile/objcodes.c
View file

@ -68,7 +68,7 @@
#define DT_GUILE_GC_ROOT_SZ 0x37146001 /* Size in machine words of GC #define DT_GUILE_GC_ROOT_SZ 0x37146001 /* Size in machine words of GC
roots */ roots */
#define DT_GUILE_ENTRY 0x37146002 /* Address of entry thunk */ #define DT_GUILE_ENTRY 0x37146002 /* Address of entry thunk */
#define DT_GUILE_RTL_VERSION 0x37146003 /* Bytecode version */ #define DT_GUILE_VM_VERSION 0x37146003 /* Bytecode version */
#define DT_HIGUILE 0x37146fff /* End of Guile-specific */ #define DT_HIGUILE 0x37146fff /* End of Guile-specific */
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
@ -280,9 +280,9 @@ process_dynamic_segment (char *base, Elf_Phdr *dyn_phdr,
return "duplicate DT_GUILE_ENTRY"; return "duplicate DT_GUILE_ENTRY";
entry = base + dyn[i].d_un.d_val; entry = base + dyn[i].d_un.d_val;
break; break;
case DT_GUILE_RTL_VERSION: case DT_GUILE_VM_VERSION:
if (bytecode_kind != BYTECODE_KIND_NONE) if (bytecode_kind != BYTECODE_KIND_NONE)
return "duplicate DT_GUILE_RTL_VERSION"; return "duplicate DT_GUILE_VM_VERSION";
{ {
scm_t_uint16 major = dyn[i].d_un.d_val >> 16; scm_t_uint16 major = dyn[i].d_un.d_val >> 16;
scm_t_uint16 minor = dyn[i].d_un.d_val & 0xffff; scm_t_uint16 minor = dyn[i].d_un.d_val & 0xffff;
@ -319,7 +319,7 @@ process_dynamic_segment (char *base, Elf_Phdr *dyn_phdr,
break; break;
case BYTECODE_KIND_NONE: case BYTECODE_KIND_NONE:
default: default:
return "missing DT_GUILE_RTL_VERSION"; return "missing DT_GUILE_VM_VERSION";
} }
if (gc_root) if (gc_root)

2
module/system/vm/assembler.scm
View file

@ -1220,7 +1220,7 @@ it will be added to the GC roots at runtime."
(* i word-size) 0 label) (* i word-size) 0 label)
relocs)) relocs))
(%set-uword! bv (* i word-size) 0 endianness)))) (%set-uword! bv (* i word-size) 0 endianness))))
(set-uword! 0 DT_GUILE_RTL_VERSION) (set-uword! 0 DT_GUILE_VM_VERSION)
(set-uword! 1 (logior (ash *bytecode-major-version* 16) (set-uword! 1 (logior (ash *bytecode-major-version* 16)
*bytecode-minor-version*)) *bytecode-minor-version*))
(set-uword! 2 DT_GUILE_ENTRY) (set-uword! 2 DT_GUILE_ENTRY)

4
module/system/vm/elf.scm
View file

@ -105,7 +105,7 @@
DT_FINI_ARRAYSZ DT_RUNPATH DT_FLAGS DT_ENCODING DT_FINI_ARRAYSZ DT_RUNPATH DT_FLAGS DT_ENCODING
DT_PREINIT_ARRAY DT_PREINIT_ARRAYSZ DT_NUM DT_LOGUILE DT_PREINIT_ARRAY DT_PREINIT_ARRAYSZ DT_NUM DT_LOGUILE
DT_GUILE_GC_ROOT DT_GUILE_GC_ROOT_SZ DT_GUILE_ENTRY DT_GUILE_GC_ROOT DT_GUILE_GC_ROOT_SZ DT_GUILE_ENTRY
DT_GUILE_RTL_VERSION DT_HIGUILE DT_LOOS DT_HIOS DT_LOPROC DT_GUILE_VM_VERSION DT_HIGUILE DT_LOOS DT_HIOS DT_LOPROC
DT_HIPROC DT_HIPROC
string-table-ref string-table-ref
@ -780,7 +780,7 @@
(define DT_GUILE_GC_ROOT #x37146000) ; Offset of GC roots (define DT_GUILE_GC_ROOT #x37146000) ; Offset of GC roots
(define DT_GUILE_GC_ROOT_SZ #x37146001) ; Size in machine words of GC roots (define DT_GUILE_GC_ROOT_SZ #x37146001) ; Size in machine words of GC roots
(define DT_GUILE_ENTRY #x37146002) ; Address of entry thunk (define DT_GUILE_ENTRY #x37146002) ; Address of entry thunk
(define DT_GUILE_RTL_VERSION #x37146003); Bytecode version (define DT_GUILE_VM_VERSION #x37146003) ; Bytecode version
(define DT_HIGUILE #x37146fff) ; End of Guile-specific (define DT_HIGUILE #x37146fff) ; End of Guile-specific
(define DT_LOOS #x6000000d) ; Start of OS-specific (define DT_LOOS #x6000000d) ; Start of OS-specific
(define DT_HIOS #x6ffff000) ; End of OS-specific (define DT_HIOS #x6ffff000) ; End of OS-specific