oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make mdb(1) compile again

Browse Source
This commit is contained in:
David van Moolenbroek 2009-06-17 14:59:22 +00:00
parent 66d1f1260c
commit d8b9bf642b
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
commands/mdb/Makefile
View File

@ -51,12 +51,6 @@ KERNEL =$(SYSTEM)/kernel
PTRACE =$(INCLUDE)/sys/ptrace.h PTRACE =$(INCLUDE)/sys/ptrace.h
# Header files from pm (used by core.c)
#
MMFILES= $(SYSTEM)/servers/pm/const.h \
$(SYSTEM)/servers/pm/type.h \
$(SYSTEM)/servers/pm/mproc.h
# Header files from system and kernel in "mdb.h" # Header files from system and kernel in "mdb.h"
# #
SYSFILES= $(INCLUDE)/minix/config.h \ SYSFILES= $(INCLUDE)/minix/config.h \

25
commands/mdb/core.c
View File

@ -4,8 +4,6 @@
* reads information from 'core' file * reads information from 'core' file
* Partly derived from 'adb' by D. Dugger. * Partly derived from 'adb' by D. Dugger.
*/ */
#include <pm/const.h>
#include "mdb.h" #include "mdb.h"
#include <signal.h> #include <signal.h>
@ -16,9 +14,6 @@
#include <string.h> #include <string.h>
#include <sys/ptrace.h> #include <sys/ptrace.h>
#include <pm/type.h>
#include <pm/mproc.h>
#include <kernel/arch/i386/include/archtypes.h> #include <kernel/arch/i386/include/archtypes.h>
#include <kernel/const.h> #include <kernel/const.h>
#include <kernel/type.h> #include <kernel/type.h>
@ -249,16 +244,14 @@ PRIVATE unsigned long c_status()
PRIVATE void read_info(fp) PRIVATE void read_info(fp)
struct file *fp; struct file *fp;
{ {
struct mproc mm_info; struct mem_map seg[NR_LOCAL_SEGS];
struct mproc *rmp;
int r; int r;
int i; int i;
rmp = &mm_info;
lseek(fp->fid, 0L, 0L); lseek(fp->fid, 0L, 0L);
/* First read memory map of all segments. */ /* First read memory map of all segments. */
if (read(fp->fid, (char *) rmp->mp_seg, (int) SIZE_MP_SEG) < 0) { if (read(fp->fid, (char *) seg, (int) SIZE_MP_SEG) < 0) {
close(fp->fid); close(fp->fid);
Printf("mdb: cannot read core header\n"); Printf("mdb: cannot read core header\n");
fp->fid = -1; fp->fid = -1;
@ -278,20 +271,20 @@ struct file *fp;
/* copy info */ /* copy info */
for (i = T; i <= S; i++) for (i = T; i <= S; i++)
cnt[i] = (long) rmp->mp_seg[i].mem_len << CLICK_SHIFT; cnt[i] = (long) seg[i].mem_len << CLICK_SHIFT;
/* This needs to be set for map_addr() below */ /* This needs to be set for map_addr() below */
if(coreonly && cnt[T] != 0) is_separate = TRUE; if(coreonly && cnt[T] != 0) is_separate = TRUE;
st_addr = (long) rmp->mp_seg[T].mem_vir << CLICK_SHIFT; st_addr = (long) seg[T].mem_vir << CLICK_SHIFT;
et_addr = st_addr + ((long) rmp->mp_seg[T].mem_len << CLICK_SHIFT); et_addr = st_addr + ((long) seg[T].mem_len << CLICK_SHIFT);
sd_addr = (long) rmp->mp_seg[D].mem_vir << CLICK_SHIFT; sd_addr = (long) seg[D].mem_vir << CLICK_SHIFT;
end_addr = ed_addr = end_addr = ed_addr =
sd_addr + ((long) rmp->mp_seg[D].mem_len << CLICK_SHIFT); sd_addr + ((long) seg[D].mem_len << CLICK_SHIFT);
sk_addr = (long) rmp->mp_seg[S].mem_vir << CLICK_SHIFT; sk_addr = (long) seg[S].mem_vir << CLICK_SHIFT;
sk_size = (long) rmp->mp_seg[S].mem_len << CLICK_SHIFT; sk_size = (long) seg[S].mem_len << CLICK_SHIFT;
setmap(fp); setmap(fp);
} }