WebSVN – HelenOS – Path Comparison – / – /trunk/kernel/arch/ia32xen/ Rev 2088 and /trunk/kernel/arch/ia32xen/ Rev 2089

Ignore whitespace Rev 2088 → Rev 2089

 /trunk/kernel/arch/ia32xen/_link.ld.in
 ,8 → 1,7
 /** ia32xen linker script
  */
-#define __ASM__
-#include <arch/boot/boot.h>
+#include <arch/hypercall.h>
 #include <arch/mm/page.h>
 ENTRY(kernel_image_start)

/trunk/kernel/arch/ia32xen/include/boot/boot.h
File deleted

 /trunk/kernel/arch/ia32xen/include/types.h
 ,6 → 36,8
 #define KERN_ia32xen_TYPES_H_
 #define NULL 0
+#define false 0
+#define true 1
 typedef signed char int8_t;
 typedef signed short int16_t;
 ,6 → 49,10
 typedef unsigned long uint32_t;
 typedef unsigned long long uint64_t;
+typedef uint32_t size_t;
+typedef uint32_t count_t;
+typedef uint32_t index_t;
 typedef uint32_t uintptr_t;
 typedef uint32_t pfn_t;
 ,8 → 61,29
 typedef uint32_t unative_t;
 typedef int32_t native_t;
-typedef struct page_specifier pte_t;
+typedef uint8_t bool;
+typedef uint64_t task_id_t;
+typedef uint32_t context_id_t;
+typedef int32_t inr_t;
+typedef int32_t devno_t;
+/** Page Table Entry. */
+typedef struct {
+    unsigned present : 1;
+    unsigned writeable : 1;
+    unsigned uaccessible : 1;
+    unsigned page_write_through : 1;
+    unsigned page_cache_disable : 1;
+    unsigned accessed : 1;
+    unsigned dirty : 1;
+    unsigned pat : 1;
+    unsigned global : 1;
+    unsigned soft_valid : 1;    /**< Valid content even if the present bit is not set. */
+    unsigned avl : 2;
+    unsigned frame_address : 20;
+} __attribute__ ((packed)) pte_t;
 #endif
 /** @}

/trunk/kernel/arch/ia32xen/include/pm.h
69,7 → 69,6
#ifndef __ASM__

#include <arch/types.h>
#include <typedefs.h>
#include <arch/context.h>

struct ptr_16_32 {

 /trunk/kernel/arch/ia32xen/include/hypercall.h
 ,31 → 29,42
 #ifndef KERN_ia32xen_HYPERCALL_H_
 #define KERN_ia32xen_HYPERCALL_H_
-#include <arch/types.h>
-#include <macros.h>
+#ifndef __ASM__
+#   include <arch/types.h>
+#   include <macros.h>
+#endif
-typedef uint16_t domid_t;
+#define GUEST_CMDLINE   1024
+#define VIRT_CPUS   32
+#define START_INFO_SIZE 1104
-typedef struct {
-    uint8_t vector;     /**< Exception vector */
-    uint8_t flags;      /**< 0-3: privilege level; 4: clear event enable */
-    uint16_t cs;        /**< Code selector */
-    void *address;      /**< Code offset */
-} trap_info_t;
+#define BOOT_OFFSET     0x0000
+#define TEMP_STACK_SIZE 0x1000
+#define XEN_VIRT_START  0xFC000000
+#define XEN_CS          0xe019
-typedef struct {
-    evtchn_t port;
-} evtchn_send_t;
+#define XEN_ELFNOTE_INFO            0
+#define XEN_ELFNOTE_ENTRY           1
+#define XEN_ELFNOTE_HYPERCALL_PAGE  2
+#define XEN_ELFNOTE_VIRT_BASE       3
+#define XEN_ELFNOTE_PADDR_OFFSET    4
+#define XEN_ELFNOTE_XEN_VERSION     5
+#define XEN_ELFNOTE_GUEST_OS        6
+#define XEN_ELFNOTE_GUEST_VERSION   7
+#define XEN_ELFNOTE_LOADER          8
+#define XEN_ELFNOTE_PAE_MODE        9
+#define XEN_ELFNOTE_FEATURES        10
+#define XEN_ELFNOTE_BSD_SYMTAB      11
-typedef struct {
-    uint32_t cmd;
-    union {
-        evtchn_send_t send;
-    };
-} evtchn_op_t;
+#define mp_map ((pfn_t *) XEN_VIRT_START)
+#define SIF_PRIVILEGED  (1 << 0)  /**< Privileged domain */
+#define SIF_INITDOMAIN  (1 << 1)  /**< Iinitial control domain */
+#define XEN_CONSOLE_VGA     0x03
+#define XEN_CONSOLE_VESA    0x23
 #define XEN_SET_TRAP_TABLE      0
 #define XEN_MMU_UPDATE          1
 #define XEN_SET_CALLBACKS       4
 ,7 → 114,139
 #define DOMID_SELF (0x7FF0U)
 #define DOMID_IO   (0x7FF1U)
+#ifndef __ASM__
+typedef uint16_t domid_t;
+typedef uint32_t evtchn_t;
+typedef struct {
+    uint32_t version;
+    uint32_t pad0;
+    uint64_t tsc_timestamp;   /**< TSC at last update of time vals */
+    uint64_t system_time;     /**< Time, in nanosecs, since boot */
+    uint32_t tsc_to_system_mul;
+    int8_t tsc_shift;
+    int8_t pad1[3];
+} vcpu_time_info_t;
+typedef struct {
+    uint32_t cr2;
+    uint32_t pad[5];
+} arch_vcpu_info_t;
+typedef struct arch_shared_info {
+    pfn_t max_pfn;                  /**< max pfn that appears in table */
+    uint32_t pfn_to_mfn_frame_list_list;
+    uint32_t nmi_reason;
+} arch_shared_info_t;
+typedef struct {
+    uint8_t evtchn_upcall_pending;
+    ipl_t evtchn_upcall_mask;
+    evtchn_t evtchn_pending_sel;
+    arch_vcpu_info_t arch;
+    vcpu_time_info_t time;
+} vcpu_info_t;
+typedef struct {
+    vcpu_info_t vcpu_info[VIRT_CPUS];
+    evtchn_t evtchn_pending[32];
+    evtchn_t evtchn_mask[32];
+    uint32_t wc_version;                  /**< Version counter */
+    uint32_t wc_sec;                      /**< Secs  00:00:00 UTC, Jan 1, 1970 */
+    uint32_t wc_nsec;                     /**< Nsecs 00:00:00 UTC, Jan 1, 1970 */
+    arch_shared_info_t arch;
+} shared_info_t;
+typedef struct {
+    int8_t magic[32];           /**< "xen-<version>-<platform>" */
+    uint32_t frames;            /**< Available frames */
+    shared_info_t *shared_info; /**< Shared info structure (machine address) */
+    uint32_t flags;             /**< SIF_xxx flags */
+    pfn_t store_mfn;            /**< Shared page (machine page) */
+    evtchn_t store_evtchn;      /**< Event channel for store communication */
+    union {
+        struct {
+            pfn_t mfn;          /**< Console page (machine page) */
+            evtchn_t evtchn;    /**< Event channel for console messages */
+        } domU;
+        struct {
+            uint32_t info_off;  /**< Offset of console_info struct */
+            uint32_t info_size; /**< Size of console_info struct from start */
+        } dom0;
+    } console;
+    pte_t *ptl0;                /**< Boot PTL0 (kernel address) */
+    uint32_t pt_frames;         /**< Number of bootstrap page table frames */
+    pfn_t *pm_map;              /**< Physical->machine frame map (kernel address) */
+    void *mod_start;            /**< Modules start (kernel address) */
+    uint32_t mod_len;           /**< Modules size (bytes) */
+    int8_t cmd_line[GUEST_CMDLINE];
+} start_info_t;
+typedef struct {
+    uint8_t video_type;
+    union {
+        struct {
+            uint16_t font_height;
+            uint16_t cursor_x;
+            uint16_t cursor_y;
+            uint16_t rows;
+            uint16_t columns;
+        } vga;
+        struct {
+            uint16_t width;
+            uint16_t height;
+            uint16_t bytes_per_line;
+            uint16_t bits_per_pixel;
+            uint32_t lfb_base;
+            uint32_t lfb_size;
+            uint8_t red_pos;
+            uint8_t red_size;
+            uint8_t green_pos;
+            uint8_t green_size;
+            uint8_t blue_pos;
+            uint8_t blue_size;
+            uint8_t rsvd_pos;
+            uint8_t rsvd_size;
+        } vesa_lfb;
+    } info;
+} console_info_t;
+typedef struct {
+    pfn_t start;
+    pfn_t size;
+    pfn_t reserved;
+} memzone_t;
+extern start_info_t start_info;
+extern shared_info_t shared_info;
+extern memzone_t meminfo;
+typedef struct {
+    uint8_t vector;     /**< Exception vector */
+    uint8_t flags;      /**< 0-3: privilege level; 4: clear event enable */
+    uint16_t cs;        /**< Code selector */
+    void *address;      /**< Code offset */
+} trap_info_t;
+typedef struct {
+    evtchn_t port;
+} evtchn_send_t;
+typedef struct {
+    uint32_t cmd;
+    union {
+        evtchn_send_t send;
+    };
+} evtchn_op_t;
 #define force_evtchn_callback() ((void) xen_version(0, 0))
 #define hypercall0(id)  \
 ,3 → 377,5
 }
 #endif
+#endif

 /trunk/kernel/arch/ia32xen/include/mm/frame.h
 ,9 → 42,6
 #ifdef KERNEL
 #ifndef __ASM__
-#include <arch/types.h>
-#include <arch/boot/boot.h>
 #define PA2MA(x)    ((start_info.pm_map[((uintptr_t) (x)) >> 12] << 12) + (((uintptr_t) (x)) & 0xfff))
 #define MA2PA(x)    ((mp_map[((uintptr_t) (x)) >> 12] << 12) + (((uintptr_t) (x)) & 0xfff))

 /trunk/kernel/arch/ia32xen/include/mm/memory_init.h
 ,7 → 36,7
 #ifndef KERN_ia32xen_MEMORY_INIT_H_
 #define KERN_ia32xen_MEMORY_INIT_H_
-#include <typedefs.h>
+#include <arch/types.h>
 size_t get_memory_size(void);

 /trunk/kernel/arch/ia32xen/include/mm/page.h
 ,11 → 121,9
 #ifndef __ASM__
-#include <mm/page.h>
-#include <arch/types.h>
-#include <arch/mm/frame.h>
-#include <typedefs.h>
+#include <mm/mm.h>
 #include <arch/hypercall.h>
+#include <arch/interrupt.h>
 /* Page fault error codes. */
 ,22 → 139,6
 /** When bit on this position is 1, a reserved bit was set in page directory. */
 #define PFERR_CODE_RSVD     (1 << 3)
-/** Page Table Entry. */
-struct page_specifier {
-    unsigned present : 1;
-    unsigned writeable : 1;
-    unsigned uaccessible : 1;
-    unsigned page_write_through : 1;
-    unsigned page_cache_disable : 1;
-    unsigned accessed : 1;
-    unsigned dirty : 1;
-    unsigned pat : 1;
-    unsigned global : 1;
-    unsigned soft_valid : 1;    /**< Valid content even if the present bit is not set. */
-    unsigned avl : 2;
-    unsigned frame_address : 20;
-} __attribute__ ((packed));
 typedef struct {
     uint64_t ptr;      /**< Machine address of PTE */
     union {            /**< New contents of PTE */

 /trunk/kernel/arch/ia32xen/include/mm/as.h
 ,6 → 47,8
 typedef struct {
 } as_arch_t;
+#include <genarch/mm/as_pt.h>
 #define as_constructor_arch(as, flags)      (as != as)
 #define as_destructor_arch(as)          (as != as)
 #define as_create_arch(as, flags)       (as != as)

/trunk/kernel/arch/ia32xen/src/ia32xen.c
36,7 → 36,6
#include <main/main.h>

#include <arch/types.h>
#include <typedefs.h>
#include <align.h>

#include <arch/pm.h>
54,7 → 53,6

#include <arch/bios/bios.h>

#include <arch/boot/boot.h>
#include <arch/mm/memory_init.h>
#include <interrupt.h>
#include <arch/debugger.h>

/trunk/kernel/arch/ia32xen/src/pm.c
35,7 → 35,6
#include <arch/pm.h>
#include <config.h>
#include <arch/types.h>
#include <typedefs.h>
#include <arch/interrupt.h>
#include <arch/asm.h>
#include <arch/context.h>
43,7 → 42,6
#include <arch/mm/page.h>
#include <mm/slab.h>
#include <memstr.h>
#include <arch/boot/boot.h>
#include <interrupt.h>

/*

/trunk/kernel/arch/ia32xen/src/smp/mps.c
42,7 → 42,6
#include <arch/smp/smp.h>
#include <func.h>
#include <arch/types.h>
#include <typedefs.h>
#include <cpu.h>
#include <arch/asm.h>
#include <arch/bios/bios.h>

/trunk/kernel/arch/ia32xen/src/smp/smp.c
36,7 → 36,6
#include <arch/smp/smp.h>
#include <arch/smp/mps.h>
#include <arch/smp/ap.h>
#include <arch/boot/boot.h>
#include <genarch/acpi/acpi.h>
#include <genarch/acpi/madt.h>
#include <config.h>

/trunk/kernel/arch/ia32xen/src/smp/apic.c
36,7 → 36,6
#include <arch/smp/apic.h>
#include <arch/smp/ap.h>
#include <arch/smp/mps.h>
#include <arch/boot/boot.h>
#include <mm/page.h>
#include <time/delay.h>
#include <interrupt.h>

 /trunk/kernel/arch/ia32xen/src/boot/boot.S
 ,9 → 26,8
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#include <arch/boot/boot.h>
 #include <arch/mm/page.h>
-#include <arch/pm.h>
+#include <arch/hypercall.h>
 #define ELFNOTE(name, type, desctype, descval) \
     .section .note.name; \

 /trunk/kernel/arch/ia32xen/src/mm/as.c
 ,7 → 34,7
  */
 #include <arch/mm/as.h>
-#include <genarch/mm/as_pt.h>
+#include <genarch/mm/page_pt.h>
 /** Architecture dependent address space init. */
 void as_arch_init(void)

/trunk/kernel/arch/ia32xen/src/mm/memory_init.c
34,7 → 34,6

#include <arch/mm/memory_init.h>
#include <arch/mm/page.h>
#include <arch/boot/boot.h>
#include <print.h>
#include <mm/frame.h>

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2088 → Rev 2089