Changeset 51

Timestamp:

Jun 26, 2017, 3:24:20 PM (7 years ago)

Author:

max@…

Message:

Create the core/ sub-directory for x86_64.

Location:

trunk

Files:

• Makefile.x86 (modified) (9 diffs)
• hal/x86_64/core (added)
• hal/x86_64/core/hal_acpi.c (moved) (moved from trunk/hal/x86_64/hal_acpi.c)
• hal/x86_64/core/hal_acpi.h (moved) (moved from trunk/hal/x86_64/hal_acpi.h)
• hal/x86_64/core/hal_arch.c (moved) (moved from trunk/hal/x86_64/hal_arch.c)
• hal/x86_64/core/hal_arch.h (moved) (moved from trunk/hal/x86_64/hal_arch.h)
• hal/x86_64/core/hal_atomic.c (moved) (moved from trunk/hal/x86_64/hal_atomic.c)
• hal/x86_64/core/hal_boot.S (moved) (moved from trunk/hal/x86_64/hal_boot.S)
• hal/x86_64/core/hal_boot.h (moved) (moved from trunk/hal/x86_64/hal_boot.h)
• hal/x86_64/core/hal_context.c (moved) (moved from trunk/hal/x86_64/hal_context.c)
• hal/x86_64/core/hal_cpu.S (moved) (moved from trunk/hal/x86_64/hal_cpu.S)
• hal/x86_64/core/hal_do_exceptions.c (moved) (moved from trunk/hal/x86_64/hal_do_exceptions.c)
• hal/x86_64/core/hal_do_interrupt.c (moved) (moved from trunk/hal/x86_64/hal_do_interrupt.c)
• hal/x86_64/core/hal_do_syscall.c (moved) (moved from trunk/hal/x86_64/hal_do_syscall.c)
• hal/x86_64/core/hal_exception.c (moved) (moved from trunk/hal/x86_64/hal_exception.c)
• hal/x86_64/core/hal_gpt.c (moved) (moved from trunk/hal/x86_64/hal_gpt.c)
• hal/x86_64/core/hal_init.c (moved) (moved from trunk/hal/x86_64/hal_init.c)
• hal/x86_64/core/hal_internal.h (moved) (moved from trunk/hal/x86_64/hal_internal.h)
• hal/x86_64/core/hal_interrupt.c (moved) (moved from trunk/hal/x86_64/hal_interrupt.c)
• hal/x86_64/core/hal_irqmask.c (moved) (moved from trunk/hal/x86_64/hal_irqmask.c)
• hal/x86_64/core/hal_kentry.S (moved) (moved from trunk/hal/x86_64/hal_kentry.S)
• hal/x86_64/core/hal_kentry.h (moved) (moved from trunk/hal/x86_64/hal_kentry.h)
• hal/x86_64/core/hal_lapic.c (moved) (moved from trunk/hal/x86_64/hal_lapic.c)
• hal/x86_64/core/hal_lapic.h (moved) (moved from trunk/hal/x86_64/hal_lapic.h)
• hal/x86_64/core/hal_multiboot.h (moved) (moved from trunk/hal/x86_64/hal_multiboot.h)
• hal/x86_64/core/hal_register.h (moved) (moved from trunk/hal/x86_64/hal_register.h)
• hal/x86_64/core/hal_remote.c (moved) (moved from trunk/hal/x86_64/hal_remote.c)
• hal/x86_64/core/hal_segmentation.h (moved) (moved from trunk/hal/x86_64/hal_segmentation.h)
• hal/x86_64/core/hal_special.c (moved) (moved from trunk/hal/x86_64/hal_special.c)
• hal/x86_64/core/hal_syscall.c (moved) (moved from trunk/hal/x86_64/hal_syscall.c)
• hal/x86_64/core/hal_trap.c (moved) (moved from trunk/hal/x86_64/hal_trap.c)
• hal/x86_64/core/hal_types.h (moved) (moved from trunk/hal/x86_64/hal_types.h)
• hal/x86_64/core/hal_uspace.c (moved) (moved from trunk/hal/x86_64/hal_uspace.c)
• hal/x86_64/core/x86_printf.c (moved) (moved from trunk/hal/x86_64/x86_printf.c)

trunk/Makefile.x86

@@ -194 +194 @@
                  -Itools/arch_info       \
                  -Ihal/generic           \
-                 -Ihal/x86_64            \
+                 -Ihal/x86_64/core       \
                  -I.
 
@@ -277 +277 @@
                                 kernel/drivers/soclib/%.h   \
                                 kernel_config.h             \
-                                hal/x86_64/hal_types.h
+                                hal/x86_64/core/hal_types.h
         $(CC) $(KERNEL_INCLUDE) $(CFLAGS)  -c -o $@ $<
         $(DU) -D $@ > $@.txt
@@ -286 +286 @@
                                 kernel/kern/%.h             \
                                 kernel_config.h             \
-                                hal/x86_64/hal_types.h
+                                hal/x86_64/core/hal_types.h
         $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
         $(DU) -D $@ > $@.txt
@@ -292 +292 @@
 ######################################
 # Rules to generate kernel/hal objects
-build/kernel/hal/%.o:           hal/x86_64/%.c         \
+build/kernel/hal/%.o:           hal/x86_64/core/%.c         \
                                 hal/generic/%.h             \
                                 kernel_config.h             \
-                                hal/x86_64/hal_types.h
-        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
-        $(DU) -D $@ > $@.txt
-
-build/kernel/hal/hal_boot.o:    hal/x86_64/hal_boot.S \
-                                hal/x86_64/hal_boot.h        \
-                                hal/x86_64/hal_multiboot.h   \
-                                hal/x86_64/hal_segmentation.h \
-                                kernel_config.h              \
-                                hal/x86_64/hal_types.h
-        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
-        $(DU) -D $@ > $@.txt
-
-build/kernel/hal/hal_init.o:    hal/x86_64/hal_init.c         \
-                                hal/x86_64/hal_boot.h         \
-                                hal/x86_64/hal_multiboot.h    \
-                                hal/x86_64/hal_segmentation.h \
-                                hal/x86_64/hal_acpi.h         \
-                                hal/x86_64/hal_lapic.h        \
-                                hal/x86_64/hal_internal.h     \
+                                hal/x86_64/core/hal_types.h
+        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
+        $(DU) -D $@ > $@.txt
+
+build/kernel/hal/hal_boot.o:    hal/x86_64/core/hal_boot.S \
+                                hal/x86_64/core/hal_boot.h        \
+                                hal/x86_64/core/hal_multiboot.h   \
+                                hal/x86_64/core/hal_segmentation.h \
+                                kernel_config.h              \
+                                hal/x86_64/core/hal_types.h
+        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
+        $(DU) -D $@ > $@.txt
+
+build/kernel/hal/hal_init.o:    hal/x86_64/core/hal_init.c         \
+                                hal/x86_64/core/hal_boot.h         \
+                                hal/x86_64/core/hal_multiboot.h    \
+                                hal/x86_64/core/hal_segmentation.h \
+                                hal/x86_64/core/hal_acpi.h         \
+                                hal/x86_64/core/hal_lapic.h        \
+                                hal/x86_64/core/hal_internal.h     \
                                 kernel_config.h               \
-                                hal/x86_64/hal_types.h
-        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
-        $(DU) -D $@ > $@.txt
-
-build/kernel/hal/hal_cpu.o:     hal/x86_64/hal_cpu.S \
-                                hal/x86_64/hal_boot.h        \
-                                hal/x86_64/hal_segmentation.h \
-                                kernel_config.h              \
-                                hal/x86_64/hal_types.h
-        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
-        $(DU) -D $@ > $@.txt
-
-build/kernel/hal/hal_trap.o:    hal/x86_64/hal_trap.c \
-                                hal/x86_64/hal_boot.h        \
-                                hal/x86_64/hal_segmentation.h \
-                                kernel_config.h              \
-                                hal/x86_64/hal_types.h
-        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
-        $(DU) -D $@ > $@.txt
-
-build/kernel/hal/hal_kentry.o:  hal/x86_64/hal_kentry.S      \
-                                hal/x86_64/hal_kentry.h      \
-                                hal/x86_64/hal_boot.h        \
-                                kernel_config.h              \
-                                hal/x86_64/hal_types.h
-        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
-        $(DU) -D $@ > $@.txt
-
-build/kernel/hal/hal_acpi.o:    hal/x86_64/hal_acpi.c        \
-                                hal/x86_64/hal_acpi.h        \
-                                kernel_config.h              \
-                                hal/x86_64/hal_types.h
-        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
-        $(DU) -D $@ > $@.txt
-
-build/kernel/hal/hal_lapic.o:   hal/x86_64/hal_lapic.c       \
-                                hal/x86_64/hal_lapic.h       \
-                                kernel_config.h              \
-                                hal/x86_64/hal_types.h
-        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
-        $(DU) -D $@ > $@.txt
-
-build/kernel/hal/x86_printf.o:  hal/x86_64/x86_printf.c      \
-                                kernel_config.h              \
-                                hal/x86_64/hal_types.h
+                                hal/x86_64/core/hal_types.h
+        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
+        $(DU) -D $@ > $@.txt
+
+build/kernel/hal/hal_cpu.o:     hal/x86_64/core/hal_cpu.S \
+                                hal/x86_64/core/hal_boot.h        \
+                                hal/x86_64/core/hal_segmentation.h \
+                                kernel_config.h              \
+                                hal/x86_64/core/hal_types.h
+        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
+        $(DU) -D $@ > $@.txt
+
+build/kernel/hal/hal_trap.o:    hal/x86_64/core/hal_trap.c \
+                                hal/x86_64/core/hal_boot.h        \
+                                hal/x86_64/core/hal_segmentation.h \
+                                kernel_config.h              \
+                                hal/x86_64/core/hal_types.h
+        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
+        $(DU) -D $@ > $@.txt
+
+build/kernel/hal/hal_kentry.o:  hal/x86_64/core/hal_kentry.S      \
+                                hal/x86_64/core/hal_kentry.h      \
+                                hal/x86_64/core/hal_boot.h        \
+                                kernel_config.h              \
+                                hal/x86_64/core/hal_types.h
+        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
+        $(DU) -D $@ > $@.txt
+
+build/kernel/hal/hal_acpi.o:    hal/x86_64/core/hal_acpi.c        \
+                                hal/x86_64/core/hal_acpi.h        \
+                                kernel_config.h              \
+                                hal/x86_64/core/hal_types.h
+        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
+        $(DU) -D $@ > $@.txt
+
+build/kernel/hal/hal_lapic.o:   hal/x86_64/core/hal_lapic.c       \
+                                hal/x86_64/core/hal_lapic.h       \
+                                kernel_config.h              \
+                                hal/x86_64/core/hal_types.h
+        $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
+        $(DU) -D $@ > $@.txt
+
+build/kernel/hal/x86_printf.o:  hal/x86_64/core/x86_printf.c      \
+                                kernel_config.h              \
+                                hal/x86_64/core/hal_types.h
         $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
         $(DU) -D $@ > $@.txt
@@ -369 +369 @@
                                 kernel/devices/%.h          \
                                 kernel_config.h             \
-                                hal/x86_64/hal_types.h
+                                hal/x86_64/core/hal_types.h
         $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
         $(DU) -D $@ > $@.txt
@@ -378 +378 @@
                                 kernel/mm/%.h               \
                                 kernel_config.h             \
-                                hal/x86_64/hal_types.h
+                                hal/x86_64/core/hal_types.h
         $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
         $(DU) -D $@ > $@.txt
@@ -387 +387 @@
                                 kernel/libk/%.h             \
                                 kernel_config.h             \
-                                hal/x86_64/hal_types.h
+                                hal/x86_64/core/hal_types.h
         $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
         $(DU) -D $@ > $@.txt
@@ -396 +396 @@
                                 kernel/syscalls/syscalls.h  \
                                 kernel_config.h             \
-                                hal/x86_64/hal_types.h
+                                hal/x86_64/core/hal_types.h
         $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
         $(DU) -D $@ > $@.txt
@@ -405 +405 @@
                                 kernel/vfs/%.h              \
                                 kernel_config.h             \
-                                hal/x86_64/hal_types.h
+                                hal/x86_64/core/hal_types.h
         $(CC) $(KERNEL_INCLUDE) $(CFLAGS) -c -o $@ $<
         $(DU) -D $@ > $@.txt