PERFORCE change 73453 for review

[Juli Mallett]

http://perforce.freebsd.org/chv.cgi?CH=73453

Change 73453 by jmallett at jmallett_windward on 2005/03/18 09:23:28

	Link (it runs!)

Affected files ...

.. //depot/projects/mips/sys/mips/mips/elf_machdep.c#5 edit
.. //depot/projects/mips/sys/mips/mips/machdep.c#50 edit
.. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#38 edit

Differences ...

==== //depot/projects/mips/sys/mips/mips/elf_machdep.c#5 (text+ko) ====

@@ -31,6 +31,12 @@
 #include <sys/imgact.h>
 #include <sys/imgact_elf.h>
 
+void
+elf64_dump_thread(struct thread *td, void *dst, size_t *off)
+{
+	printf("%s unimplemented at %s:%d.\n", __func__, __FILE__, __LINE__);
+}
+
 int
 elf_cpu_load_file(linker_file_t fil)
 {

==== //depot/projects/mips/sys/mips/mips/machdep.c#50 (text+ko) ====

@@ -35,6 +35,8 @@
 #include <sys/imgact.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
 #include <sys/ucontext.h>
 #include <sys/proc.h>
 #include <sys/ptrace.h>
@@ -114,6 +116,13 @@
 
 }
 
+/* Get current clock frequency for the given cpu id. */
+int
+cpu_est_clockrate(int cpu_id, uint64_t *rate)
+{
+	return (ENXIO);
+}
+
 void
 cpu_halt(void)
 {
@@ -210,6 +219,12 @@
 }
 
 int
+ptrace_clear_single_step(struct thread *td)
+{
+	return (0);
+}
+
+int
 ptrace_single_step(struct thread *td)
 {
 	return (0);

==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#38 (text+ko) ====

@@ -62,7 +62,8 @@
 	{ NULL,		NULL,		0 }
 };
 
-int arcsmem, availmem, lpmem;
+long realmem;
+static long arcsmem, availmem, lpmem;
 int mach_type, mach_subtype, mach_boardrev;
 
 struct platform platform;
@@ -124,6 +125,7 @@
 		if (mem == NULL)
 			break;
 
+		realmem += btoc(size);
 		first = round_page(mem->BasePage << ARCS_PAGESHIFT);
 		last = trunc_page(first + (mem->PageCount << ARCS_PAGESHIFT));
 		size = last - first;
@@ -159,11 +161,13 @@
 platform_identify(void)
 {
 	printf("machine: %s\n", arcs_systemid());
-	printf("ARCS memory = %d (%d KB)\n", ctob(arcsmem),
+	printf("real memory = %ld (%ld MB)\n", ctob(realmem),
+	       ctob(realmem) / (1024 * 1024));
+	printf("ARCS memory = %ld (%ld KB)\n", ctob(arcsmem),
 	       ctob(arcsmem) / 1024);
-	printf("Loaded program memory = %d (%d KB)\n", ctob(lpmem),
+	printf("Loaded program memory = %ld (%ld KB)\n", ctob(lpmem),
 	       ctob(lpmem) / 1024);
-	printf("avail memory = %d (%d MB)\n", ctob(availmem),
+	printf("avail memory = %ld (%ld MB)\n", ctob(availmem),
 	       ctob(availmem) / (1024 * 1024));
 }