Changeset d9f81af3 in mainline

Timestamp:

2005-09-01T01:08:51Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

75d5721

Parents:

470c468

Message:

Fixed bad type in frame.c.
Amd64 prints banner.

Files:

• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/amd64/include/asm.h (modified) (1 diff)
• arch/amd64/src/boot/memmap.S (modified) (1 diff)
• arch/amd64/src/dummy.s (modified) (3 diffs)
• arch/amd64/src/mm/page.c (moved) (moved from arch/amd64/include/mm/memory_init.h ) (2 diffs)
• src/build.amd64 (modified) (1 diff)
• src/mm/frame.c (modified) (1 diff)

arch/amd64/Makefile.inc

@@ -28 +28 @@
         arch/amd64.c \
         arch/bios/bios.c \
-        arch/interrupt.c
+        arch/interrupt.c \
+        arch/mm/frame.c \
+        arch/mm/page.c \
+        arch/mm/tlb.c

arch/amd64/include/asm.h

@@ -140 +140 @@
 static inline __u32 read_cr2(void) { __u64 v; __asm__ volatile ("movq %%cr2,%0" : "=r" (v)); return v; }
 
+/** Write CR3
+ *
+ * Write value to CR3.
+ *
+ * @param v Value to be written.
+ */
+static inline void write_cr3(__u64 v) { __asm__ volatile ("movq %0,%%cr3\n" : : "r" (v)); }
+
+/** Read CR3
+ *
+ * Return value in CR3
+ *
+ * @return Value read.
+ */
+static inline __u32 read_cr3(void) { __u64 v; __asm__ volatile ("movq %%cr3,%0" : "=r" (v)); return v; }
+
+/** Set priority level low
+ *
+ * Enable interrupts and return previous
+ * value of EFLAGS.
+ */
+
+
 
 extern size_t interrupt_handler_size;

arch/amd64/src/boot/memmap.S

@@ -120 +120 @@
 
 e820counter:
-        .byte 0xff
+        .byte 0x0
 
 e820table:
-        .space  (32*E820_RECORD_SIZE),0xff # space for 32 records, each E820_RECORD_SIZE bytes long
+        .space  (32*E820_RECORD_SIZE),0x0 # space for 32 records, each E820_RECORD_SIZE bytes long

arch/amd64/src/dummy.s

@@ -36 +36 @@
 .global cpu_sleep
 .global cpu_print_report
-.global get_memory_size
 .global arch_late_init
 .global calibrate_delay_loop
 .global cpu_halt
-.global page_arch_init
-.global frame_arch_init
 .global dummy
 .global rdtsc
@@ -49 +46 @@
 .global interrupt_handler_size
 .global interrupt_handlers
+.global memory_print_map
+.global get_memory_size
+
+get_memory_size:
+        movq $4*1024*1024, %rax
+        ret
 
 interrupt_handler_size:
@@ -61 +64 @@
 cpu_sleep:
 cpu_print_report:
-get_memory_size:
 arch_late_init:
 calibrate_delay_loop:
 cpu_halt:
-page_arch_init:
-frame_arch_init:
 reset_TS_flag:
-fpu_init:       
+fpu_init:
+memory_print_map:       
         
 dummy:

arch/amd64/src/mm/page.c

@@ -1 +1 @@
 /*
- * Copyright (C) 2005 Martin Decky
+ * Copyright (C) 2001-2004 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef __amd64_MEMORY_INIT_H__
-#define __amd64_MEMORY_INIT_H__
+#include <mm/page.h>
+#include <arch/mm/page.h>
 
-#include <config.h>
-
-size_t get_memory_size(void);
-
-#endif
+void page_arch_init(void)
+{
+}

src/build.amd64

@@ -6 +6 @@
 # Create links to ia32 architecture
 for a in drivers bios interrupt.c; do
-  ln -sf ../../../arch/ia32/src/$a ../arch/amd64/src/
+  ln -sf ../../ia32/src/$a ../arch/amd64/src/
+done
+for a in frame.c tlb.c; do
+  ln -sf ../../../ia32/src/mm/$a ../arch/amd64/src/mm
 done
 
 for a in ega.h i8042.h i8259.h i8254.h cpuid.h interrupt.h bios; do
-  ln -sf ../../../arch/ia32/include/$a ../arch/amd64/include/
+  ln -sf ../../ia32/include/$a ../arch/amd64/include/
 done
+ln -sf ../../../ia32/include/mm/memory_init.h ../arch/amd64/include/mm/
 
 make dist-clean ARCH=ia32

src/mm/frame.c

@@ -192 +192 @@
 void frame_region_not_free(__address start, __address stop)
 {
-        __u32 i;
+        __address a;
 
         start /= FRAME_SIZE;
         stop /= FRAME_SIZE;
-        for (i = start; i <= stop; i++)
-                frame_not_free(i * FRAME_SIZE);
-}
+        for (a = start; a <= stop; a++)
+                frame_not_free(a * FRAME_SIZE);
+}