Author: attilio
Date: Tue Nov 9 21:06:26 2010
New Revision: 215058
URL: http://svn.freebsd.org/changeset/base/215058
Log:
MFC r214373, r214380, r214386:
Move dump_machdep.c into x86/ for amd64, i386 and pc98.
Sponsored by: Sandvine Incorporated
Added:
stable/8/sys/x86/x86/dump_machdep.c
- copied, changed from r215054, stable/8/sys/i386/i386/dump_machdep.c
Deleted:
stable/8/sys/amd64/amd64/dump_machdep.c
stable/8/sys/i386/i386/dump_machdep.c
Modified:
stable/8/sys/conf/files.amd64
stable/8/sys/conf/files.i386
stable/8/sys/conf/files.pc98
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/conf/files.amd64
==============================================================================
--- stable/8/sys/conf/files.amd64 Tue Nov 9 21:00:51 2010
(r215057)
+++ stable/8/sys/conf/files.amd64 Tue Nov 9 21:06:26 2010
(r215058)
@@ -104,7 +104,6 @@ amd64/amd64/cpu_switch.S standard
amd64/amd64/db_disasm.c optional ddb
amd64/amd64/db_interface.c optional ddb
amd64/amd64/db_trace.c optional ddb
-amd64/amd64/dump_machdep.c standard
amd64/amd64/elf_machdep.c standard
amd64/amd64/exception.S standard
amd64/amd64/fpu.c standard
@@ -318,4 +317,5 @@ x86/isa/isa.c standard
x86/isa/isa_dma.c standard
x86/isa/nmi.c standard
x86/pci/qpi.c standard
+x86/x86/dump_machdep.c standard
x86/x86/mca.c standard
Modified: stable/8/sys/conf/files.i386
==============================================================================
--- stable/8/sys/conf/files.i386 Tue Nov 9 21:00:51 2010
(r215057)
+++ stable/8/sys/conf/files.i386 Tue Nov 9 21:06:26 2010
(r215058)
@@ -260,7 +260,6 @@ i386/i386/busdma_machdep.c standard
i386/i386/db_disasm.c optional ddb
i386/i386/db_interface.c optional ddb
i386/i386/db_trace.c optional ddb
-i386/i386/dump_machdep.c standard
i386/i386/elan-mmcr.c optional cpu_elan | cpu_soekris
i386/i386/elf_machdep.c standard
i386/i386/exception.s optional native
@@ -393,4 +392,5 @@ x86/isa/isa.c optional isa
x86/isa/isa_dma.c optional isa
x86/isa/nmi.c standard
x86/pci/qpi.c standard
+x86/x86/dump_machdep.c standard
x86/x86/mca.c standard
Modified: stable/8/sys/conf/files.pc98
==============================================================================
--- stable/8/sys/conf/files.pc98 Tue Nov 9 21:00:51 2010
(r215057)
+++ stable/8/sys/conf/files.pc98 Tue Nov 9 21:06:26 2010
(r215058)
@@ -138,7 +138,6 @@ i386/i386/busdma_machdep.c standard
i386/i386/db_disasm.c optional ddb
i386/i386/db_interface.c optional ddb
i386/i386/db_trace.c optional ddb
-i386/i386/dump_machdep.c standard
i386/i386/elf_machdep.c standard
i386/i386/exception.s standard
i386/i386/gdb_machdep.c optional gdb
@@ -257,4 +256,5 @@ pc98/pc98/pc98_machdep.c standard
#
x86/isa/atpic.c optional atpic
x86/isa/isa.c optional isa
+x86/x86/dump_machdep.c standard
x86/x86/mca.c standard
Copied and modified: stable/8/sys/x86/x86/dump_machdep.c (from r215054,
stable/8/sys/i386/i386/dump_machdep.c)
==============================================================================
--- stable/8/sys/i386/i386/dump_machdep.c Tue Nov 9 20:46:41 2010
(r215054, copy source)
+++ stable/8/sys/x86/x86/dump_machdep.c Tue Nov 9 21:06:26 2010
(r215058)
@@ -39,6 +39,14 @@ __FBSDID("$FreeBSD$");
#include <machine/elf.h>
#include <machine/md_var.h>
+#ifdef __amd64__
+#define KERNELDUMP_VERSION KERNELDUMP_AMD64_VERSION
+#define EM_VALUE EM_X86_64
+#else
+#define KERNELDUMP_VERSION KERNELDUMP_I386_VERSION
+#define EM_VALUE EM_386
+#endif
+
CTASSERT(sizeof(struct kerneldumpheader) == 512);
int do_minidump = 1;
@@ -168,7 +176,8 @@ cb_dumpdata(struct md_pa *mdp, int seqnr
if (maxdumppgs == 0) /* seatbelt */
maxdumppgs = 1;
- printf(" chunk %d: %lldMB (%lld pages)", seqnr, PG2MB(pgs), pgs);
+ printf(" chunk %d: %juMB (%ju pages)", seqnr, (uintmax_t)PG2MB(pgs),
+ (uintmax_t)pgs);
while (pgs) {
chunk = pgs;
@@ -177,7 +186,7 @@ cb_dumpdata(struct md_pa *mdp, int seqnr
sz = chunk << PAGE_SHIFT;
counter += sz;
if (counter >> 24) {
- printf(" %lld", PG2MB(pgs));
+ printf(" %ju", (uintmax_t)PG2MB(pgs));
counter &= (1<<24) - 1;
}
for (i = 0; i < chunk; i++) {
@@ -279,7 +288,7 @@ dumpsys(struct dumperinfo *di)
ehdr.e_ident[EI_VERSION] = EV_CURRENT;
ehdr.e_ident[EI_OSABI] = ELFOSABI_STANDALONE; /* XXX big picture? */
ehdr.e_type = ET_CORE;
- ehdr.e_machine = EM_386;
+ ehdr.e_machine = EM_VALUE;
ehdr.e_phoff = sizeof(ehdr);
ehdr.e_flags = 0;
ehdr.e_ehsize = sizeof(ehdr);
@@ -304,7 +313,8 @@ dumpsys(struct dumperinfo *di)
dumplo = di->mediaoffset + di->mediasize - dumpsize;
dumplo -= sizeof(kdh) * 2;
- mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_I386_VERSION, dumpsize,
di->blocksize);
+ mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_VERSION, dumpsize,
+ di->blocksize);
printf("Dumping %llu MB (%d chunks)\n", (long long)dumpsize >> 20,
ehdr.e_phnum);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
