Changeset 95498e5 in mainline for arch/amd64

Timestamp:

2005-12-05T23:18:18Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

59b6a70

Parents:

eef75f6

Message:

Map all available frames of memory on ia32 and amd64 (ticket #10).

Location:

arch/amd64

Files:

• include/mm/frame.h (modified) (1 diff)
• src/mm/page.c (modified) (3 diffs)

arch/amd64/include/mm/frame.h

@@ -30 +30 @@
 #define __amd64_FRAME_H__
 
+#ifndef __ASM__
+#include <arch/types.h>
+#endif /* __ASM__ */
+
 #define FRAME_SIZE              4096
 
 #ifndef __ASM__
+extern __address last_frame;
 extern void frame_arch_init(void);
-#endif
+#endif /* __ASM__ */
 
 #endif

arch/amd64/src/mm/page.c

@@ -27 +27 @@
  */
 
+#include <arch/mm/page.h>
+#include <arch/mm/frame.h>
 #include <mm/page.h>
 #include <mm/frame.h>
-#include <arch/mm/page.h>
 #include <arch/interrupt.h>
 #include <arch/asm.h>
 #include <config.h>
-
 #include <memstr.h>
-
 
 __address bootstrap_dba; 
@@ -42 +41 @@
 {
         __address dba;
-        count_t i;
+        __address cur;
 
         if (config.cpu_active == 1) {
@@ -53 +52 @@
                  * PA2KA(identity) mapping for all frames.
                  */
-                for (i = 0; i < config.memory_size/FRAME_SIZE; i++) {
-                        page_mapping_insert(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE | PAGE_EXEC, KA2PA(dba));
+                for (cur = 0; cur < last_frame; cur += FRAME_SIZE) {
+                        page_mapping_insert(PA2KA(cur), cur, PAGE_CACHEABLE | PAGE_EXEC, KA2PA(dba));
                 }