diff options
Diffstat (limited to 'freebsd/sys/kern/subr_module.c')
-rw-r--r-- | freebsd/sys/kern/subr_module.c | 77 |
1 files changed, 50 insertions, 27 deletions
diff --git a/freebsd/sys/kern/subr_module.c b/freebsd/sys/kern/subr_module.c index 592bd083..f2aa7026 100644 --- a/freebsd/sys/kern/subr_module.c +++ b/freebsd/sys/kern/subr_module.c @@ -37,7 +37,8 @@ __FBSDID("$FreeBSD$"); * Preloaded module support */ -caddr_t preload_metadata; +vm_offset_t preload_addr_relocate = 0; +caddr_t preload_metadata; /* * Search for the preloaded module (name) @@ -46,24 +47,24 @@ caddr_t preload_search_by_name(const char *name) { caddr_t curp; - u_int32_t *hdr; + uint32_t *hdr; int next; if (preload_metadata != NULL) { curp = preload_metadata; for (;;) { - hdr = (u_int32_t *)curp; + hdr = (uint32_t *)curp; if (hdr[0] == 0 && hdr[1] == 0) break; /* Search for a MODINFO_NAME field */ if ((hdr[0] == MODINFO_NAME) && - !strcmp(name, curp + sizeof(u_int32_t) * 2)) + !strcmp(name, curp + sizeof(uint32_t) * 2)) return(curp); /* skip to next field */ - next = sizeof(u_int32_t) * 2 + hdr[1]; + next = sizeof(uint32_t) * 2 + hdr[1]; next = roundup(next, sizeof(u_long)); curp += next; } @@ -78,7 +79,7 @@ caddr_t preload_search_by_type(const char *type) { caddr_t curp, lname; - u_int32_t *hdr; + uint32_t *hdr; int next; if (preload_metadata != NULL) { @@ -86,7 +87,7 @@ preload_search_by_type(const char *type) curp = preload_metadata; lname = NULL; for (;;) { - hdr = (u_int32_t *)curp; + hdr = (uint32_t *)curp; if (hdr[0] == 0 && hdr[1] == 0) break; @@ -96,11 +97,11 @@ preload_search_by_type(const char *type) /* Search for a MODINFO_TYPE field */ if ((hdr[0] == MODINFO_TYPE) && - !strcmp(type, curp + sizeof(u_int32_t) * 2)) + !strcmp(type, curp + sizeof(uint32_t) * 2)) return(lname); /* skip to next field */ - next = sizeof(u_int32_t) * 2 + hdr[1]; + next = sizeof(uint32_t) * 2 + hdr[1]; next = roundup(next, sizeof(u_long)); curp += next; } @@ -115,7 +116,7 @@ caddr_t preload_search_next_name(caddr_t base) { caddr_t curp; - u_int32_t *hdr; + uint32_t *hdr; int next; if (preload_metadata != NULL) { @@ -124,15 +125,15 @@ preload_search_next_name(caddr_t base) if (base) { /* skip to next field */ curp = base; - hdr = (u_int32_t *)curp; - next = sizeof(u_int32_t) * 2 + hdr[1]; + hdr = (uint32_t *)curp; + next = sizeof(uint32_t) * 2 + hdr[1]; next = roundup(next, sizeof(u_long)); curp += next; } else curp = preload_metadata; for (;;) { - hdr = (u_int32_t *)curp; + hdr = (uint32_t *)curp; if (hdr[0] == 0 && hdr[1] == 0) break; @@ -141,7 +142,7 @@ preload_search_next_name(caddr_t base) return curp; /* skip to next field */ - next = sizeof(u_int32_t) * 2 + hdr[1]; + next = sizeof(uint32_t) * 2 + hdr[1]; next = roundup(next, sizeof(u_long)); curp += next; } @@ -157,13 +158,13 @@ caddr_t preload_search_info(caddr_t mod, int inf) { caddr_t curp; - u_int32_t *hdr; - u_int32_t type = 0; + uint32_t *hdr; + uint32_t type = 0; int next; curp = mod; for (;;) { - hdr = (u_int32_t *)curp; + hdr = (uint32_t *)curp; /* end of module data? */ if (hdr[0] == 0 && hdr[1] == 0) break; @@ -184,10 +185,10 @@ preload_search_info(caddr_t mod, int inf) * data. */ if (hdr[0] == inf) - return(curp + (sizeof(u_int32_t) * 2)); + return(curp + (sizeof(uint32_t) * 2)); /* skip to next field */ - next = sizeof(u_int32_t) * 2 + hdr[1]; + next = sizeof(uint32_t) * 2 + hdr[1]; next = roundup(next, sizeof(u_long)); curp += next; } @@ -201,7 +202,7 @@ void preload_delete_name(const char *name) { caddr_t curp; - u_int32_t *hdr; + uint32_t *hdr; int next; int clearing; @@ -210,13 +211,13 @@ preload_delete_name(const char *name) clearing = 0; curp = preload_metadata; for (;;) { - hdr = (u_int32_t *)curp; + hdr = (uint32_t *)curp; if (hdr[0] == 0 && hdr[1] == 0) break; /* Search for a MODINFO_NAME field */ if (hdr[0] == MODINFO_NAME) { - if (!strcmp(name, curp + sizeof(u_int32_t) * 2)) + if (!strcmp(name, curp + sizeof(uint32_t) * 2)) clearing = 1; /* got it, start clearing */ else if (clearing) clearing = 0; /* at next one now.. better stop */ @@ -225,19 +226,41 @@ preload_delete_name(const char *name) hdr[0] = MODINFO_EMPTY; /* skip to next field */ - next = sizeof(u_int32_t) * 2 + hdr[1]; + next = sizeof(uint32_t) * 2 + hdr[1]; next = roundup(next, sizeof(u_long)); curp += next; } } } +void * +preload_fetch_addr(caddr_t mod) +{ + caddr_t *mdp; + + mdp = (caddr_t *)preload_search_info(mod, MODINFO_ADDR); + if (mdp == NULL) + return (NULL); + return (*mdp + preload_addr_relocate); +} + +size_t +preload_fetch_size(caddr_t mod) +{ + size_t *mdp; + + mdp = (size_t *)preload_search_info(mod, MODINFO_SIZE); + if (mdp == NULL) + return (0); + return (*mdp); +} + /* Called from locore on i386. Convert physical pointers to kvm. Sigh. */ void preload_bootstrap_relocate(vm_offset_t offset) { caddr_t curp; - u_int32_t *hdr; + uint32_t *hdr; vm_offset_t *ptr; int next; @@ -245,7 +268,7 @@ preload_bootstrap_relocate(vm_offset_t offset) curp = preload_metadata; for (;;) { - hdr = (u_int32_t *)curp; + hdr = (uint32_t *)curp; if (hdr[0] == 0 && hdr[1] == 0) break; @@ -254,14 +277,14 @@ preload_bootstrap_relocate(vm_offset_t offset) case MODINFO_ADDR: case MODINFO_METADATA|MODINFOMD_SSYM: case MODINFO_METADATA|MODINFOMD_ESYM: - ptr = (vm_offset_t *)(curp + (sizeof(u_int32_t) * 2)); + ptr = (vm_offset_t *)(curp + (sizeof(uint32_t) * 2)); *ptr += offset; break; } /* The rest is beyond us for now */ /* skip to next field */ - next = sizeof(u_int32_t) * 2 + hdr[1]; + next = sizeof(uint32_t) * 2 + hdr[1]; next = roundup(next, sizeof(u_long)); curp += next; } |