libmach: support disassembling from memory

[plan9front.git] / sys / src / libmach / 6.c

diff --git a/sys/src/libmach/6.c b/sys/src/libmach/6.c
index a3566f60b5ac5499f276c2ad94b40c4e685db968..a4d7d2e67cfbde6e4384fad7a662993092b7ff23 100644 (file)
--- a/sys/src/libmach/6.c
+++ b/sys/src/libmach/6.c
@@ -40,8 +40,8 @@ Reglist amd64reglist[] = {
        {"TYPE",        REGOFF(type),   RINT, 'Y'},
        {"TRAP",        REGOFF(type),   RINT, 'Y'},     /* alias for acid */
        {"ERROR",       REGOFF(error),  RINT, 'Y'},
-       {"IP",          REGOFF(ip),     RINT, 'Y'},
-       {"PC",          REGOFF(ip),     RINT, 'Y'},     /* alias for acid */
+       {"IP",          REGOFF(pc),     RINT, 'Y'},
+       {"PC",          REGOFF(pc),     RINT, 'Y'},     /* alias for acid */
        {"CS",          REGOFF(cs),     RINT, 'Y'},
        {"FLAGS",       REGOFF(flags),  RINT, 'Y'},
        {"SP",          REGOFF(sp),     RINT, 'Y'},
@@ -105,8 +105,8 @@ Mach mamd64=
        0,                      /* link register */
        "setSB",                /* static base register name (bogus anyways) */
        0,                      /* static base register value */
-       0x200000,               /* page size */
-       0xfffffffff0110000ull,  /* kernel base */
+       0x200000,               /* page size (for segment alignment) */
+       0xffffffff80110000ull,  /* kernel base */
        0xffff800000000000ull,  /* kernel text mask */
        0x00007ffffffff000ull,  /* user stack top */
        1,                      /* quantization of pc */