Merge pull request #9 from nekernel-org/dev

v0.0.6: NeBoot

13 files changed, 95 insertions, 90 deletions

diff --git a/.github/workflows/arm64.yml b/.github/workflows/arm64.yml
index 14a815a..80c4d8b 100644
--- a/.github/workflows/arm64.yml
+++ b/.github/workflows/arm64.yml
@@ -2,9 +2,9 @@ name: FW CI (ARM64)
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "stable" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "stable" ]
 
 jobs:
   build:
@@ -16,4 +16,4 @@ jobs:
     - name: Install Packages
       run: sudo apt update && sudo apt install gcc-aarch64-linux-gnu
     - name: Build FW (ARM64)
-      run: cd src && cd arm64 && make -f ci.make all
\ No newline at end of file
+      run: cd src && cd arm64 && make -f ci.make all
diff --git a/.github/workflows/rv64.yml b/.github/workflows/rv64.yml
index e25982b..23fef58 100644
--- a/.github/workflows/rv64.yml
+++ b/.github/workflows/rv64.yml
@@ -2,9 +2,9 @@ name: FW CI (RV64)
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "stable" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "stable" ]
 
 jobs:
   build:
@@ -16,4 +16,4 @@ jobs:
     - name: Install Packages
       run: sudo apt update && sudo apt install gcc-riscv64-unknown-elf
     - name: Build FW (ARM64)
-      run: cd src && cd rv64 && make -f ci.make all
\ No newline at end of file
+      run: cd src && cd rv64 && make -f ci.make all
diff --git a/.gitmodules b/.gitmodules
index a055e73..4fe6522 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "meta/css"]
-	path = meta/css
-	url = https://github.com/jothepro/doxygen-awesome-css.git
-[submodule "vendor/astdx"]
-	path = vendor/astdx
-	url = git@github.com:amlel-el-mahrouss/astdx.git
+[submodule "vendor/ocl"]
+	path = vendor/ocl
+	url = git@github.com:amlel-el-mahrouss/ocl.git
diff --git a/docs/tex/pci-tree.tex b/docs/tex/pci-tree.tex
index 894e4cf..f8d4487 100644
--- a/docs/tex/pci-tree.tex
+++ b/docs/tex/pci-tree.tex
@@ -50,13 +50,11 @@ struct hw_cb_pci_tree {
 
 \section{Official Implementations}
 
-Below are the official implementations of the PCI-Tree, organized by their programming languages.
-
 \subsection{ISO C}
 
 \begin{ImplC}
-\item {SNU Trusted Base:} https://snu.systems
-\item {NeBoot (NeKernel Boot):} https://github.com/nekernel-org/neboot
+\item {SNU Trusted Base:} \url(https://snu.systems)
+\item {NeBoot (NeKernel Boot):} \url(https://github.com/nekernel-org/neboot)
 \end{ImplC}
 
 \subsection{ISO C++}
diff --git a/lib/ppc64/mmu.h b/lib/ppc64/mmu.h
index 1953ab5..cbfbf47 100644
--- a/lib/ppc64/mmu.h
+++ b/lib/ppc64/mmu.h
@@ -402,7 +402,7 @@ extern void print_bats(void);
 #define MAS0_TLBSEL(x) (((x) << 28) & MAS0_TLBSEL_MSK)
 #define MAS0_ESEL_MSK 0x0FFF0000
 #define MAS0_ESEL(x) (((x) << 16) & MAS0_ESEL_MSK)
-#define MAS0_NV(x) ((x) & 0x00000FFF)
+#define MAS0_NV(x) ((x) &0x00000FFF)
 
 #define MAS1_VALID 0x80000000
 #define MAS1_IPROT 0x40000000
@@ -454,8 +454,8 @@ extern void print_bats(void);
 #define FSL_BOOKE_MAS1(v, iprot, tid, ts, tsize)                                   \
   ((((v) << 31) & MAS1_VALID) | (((iprot) << 30) & MAS1_IPROT) | (MAS1_TID(tid)) | \
    (((ts) << 12) & MAS1_TS) | (MAS1_TSIZE(tsize)))
-#define FSL_BOOKE_MAS2(epn, wimge) (((epn) & MAS3_RPN) | (wimge))
-#define FSL_BOOKE_MAS3(rpn, user, perms) (((rpn) & MAS3_RPN) | (user) | (perms))
+#define FSL_BOOKE_MAS2(epn, wimge) (((epn) &MAS3_RPN) | (wimge))
+#define FSL_BOOKE_MAS3(rpn, user, perms) (((rpn) &MAS3_RPN) | (user) | (perms))
 #define FSL_BOOKE_MAS7(rpn) (((uint64_t) (rpn)) >> 32)
 
 #define BOOKE_PAGESZ_1K 0
@@ -621,10 +621,10 @@ extern int                    num_tlb_entries;
 
 /* Some handy macros */
 
-#define EPN(e) ((e) & 0xfffffc00)
+#define EPN(e) ((e) &0xfffffc00)
 #define TLB0(epn, sz) ((EPN((epn)) | (sz) | TLB_VALID))
-#define TLB1(rpn, erpn) (((rpn) & 0xfffffc00) | (erpn))
-#define TLB2(a) ((a) & 0x00000fbf)
+#define TLB1(rpn, erpn) (((rpn) &0xfffffc00) | (erpn))
+#define TLB2(a) ((a) &0x00000fbf)
 
 #define tlbtab_start \
   mflr r1;           \
diff --git a/lib/ppc64/processor.h b/lib/ppc64/processor.h
index 8ce9606..3e6e04d 100644
--- a/lib/ppc64/processor.h
+++ b/lib/ppc64/processor.h
@@ -143,36 +143,36 @@ struct pt_regs {
 #define SPRN_DBCR 0x3F2   /* Debug Control Regsiter */
 #define DBCR_EDM 0x80000000
 #define DBCR_IDM 0x40000000
-#define DBCR_RST(x) (((x) & 0x3) << 28)
+#define DBCR_RST(x) (((x) &0x3) << 28)
 #define DBCR_RST_NONE 0
 #define DBCR_RST_CORE 1
 #define DBCR_RST_CHIP 2
 #define DBCR_RST_SYSTEM 3
-#define DBCR_IC 0x08000000              /* Instruction Completion Debug Evnt */
-#define DBCR_BT 0x04000000              /* Branch Taken Debug Event */
-#define DBCR_EDE 0x02000000             /* Exception Debug Event */
-#define DBCR_TDE 0x01000000             /* TRAP Debug Event */
-#define DBCR_FER 0x00F80000             /* First Events Remaining Mask */
-#define DBCR_FT 0x00040000              /* Freeze Timers on Debug Event */
-#define DBCR_IA1 0x00020000             /* Instr. Addr. Compare 1 Enable */
-#define DBCR_IA2 0x00010000             /* Instr. Addr. Compare 2 Enable */
-#define DBCR_D1R 0x00008000             /* Data Addr. Compare 1 Read Enable */
-#define DBCR_D1W 0x00004000             /* Data Addr. Compare 1 Write Enable */
-#define DBCR_D1S(x) (((x) & 0x3) << 12) /* Data Adrr. Compare 1 Size */
+#define DBCR_IC 0x08000000             /* Instruction Completion Debug Evnt */
+#define DBCR_BT 0x04000000             /* Branch Taken Debug Event */
+#define DBCR_EDE 0x02000000            /* Exception Debug Event */
+#define DBCR_TDE 0x01000000            /* TRAP Debug Event */
+#define DBCR_FER 0x00F80000            /* First Events Remaining Mask */
+#define DBCR_FT 0x00040000             /* Freeze Timers on Debug Event */
+#define DBCR_IA1 0x00020000            /* Instr. Addr. Compare 1 Enable */
+#define DBCR_IA2 0x00010000            /* Instr. Addr. Compare 2 Enable */
+#define DBCR_D1R 0x00008000            /* Data Addr. Compare 1 Read Enable */
+#define DBCR_D1W 0x00004000            /* Data Addr. Compare 1 Write Enable */
+#define DBCR_D1S(x) (((x) &0x3) << 12) /* Data Adrr. Compare 1 Size */
 #define DAC_BYTE 0
 #define DAC_HALF 1
 #define DAC_WORD 2
 #define DAC_QUAD 3
-#define DBCR_D2R 0x00000800            /* Data Addr. Compare 2 Read Enable */
-#define DBCR_D2W 0x00000400            /* Data Addr. Compare 2 Write Enable */
-#define DBCR_D2S(x) (((x) & 0x3) << 8) /* Data Addr. Compare 2 Size */
-#define DBCR_SBT 0x00000040            /* Second Branch Taken Debug Event */
-#define DBCR_SED 0x00000020            /* Second Exception Debug Event */
-#define DBCR_STD 0x00000010            /* Second Trap Debug Event */
-#define DBCR_SIA 0x00000008            /* Second IAC Enable */
-#define DBCR_SDA 0x00000004            /* Second DAC Enable */
-#define DBCR_JOI 0x00000002            /* JTAG Serial Outbound Int. Enable */
-#define DBCR_JII 0x00000001            /* JTAG Serial Inbound Int. Enable */
+#define DBCR_D2R 0x00000800           /* Data Addr. Compare 2 Read Enable */
+#define DBCR_D2W 0x00000400           /* Data Addr. Compare 2 Write Enable */
+#define DBCR_D2S(x) (((x) &0x3) << 8) /* Data Addr. Compare 2 Size */
+#define DBCR_SBT 0x00000040           /* Second Branch Taken Debug Event */
+#define DBCR_SED 0x00000020           /* Second Exception Debug Event */
+#define DBCR_STD 0x00000010           /* Second Trap Debug Event */
+#define DBCR_SIA 0x00000008           /* Second IAC Enable */
+#define DBCR_SDA 0x00000004           /* Second DAC Enable */
+#define DBCR_JOI 0x00000002           /* JTAG Serial Outbound Int. Enable */
+#define DBCR_JII 0x00000001           /* JTAG Serial Inbound Int. Enable */
 #ifndef CONFIG_BOOKE
 #define SPRN_DBCR0 0x3F2 /* Debug Control Register 0 */
 #else
@@ -396,27 +396,27 @@ struct pt_regs {
 #ifdef CONFIG_E500MC
 #define TCR_WP(x) (((64 - x) & 0x3) << 30) | (((64 - x) & 0x3c) << 15) /* WDT Period 2^x clocks*/
 #else
-#define TCR_WP(x) (((x) & 0x3) << 30)  /* WDT Period */
-#define WP_2_17 0                      /* 2^17 clocks */
-#define WP_2_21 1                      /* 2^21 clocks */
-#define WP_2_25 2                      /* 2^25 clocks */
-#define WP_2_29 3                      /* 2^29 clocks */
-#endif                                 /* CONFIG_E500 */
-#define TCR_WRC(x) (((x) & 0x3) << 28) /* WDT Reset Control */
-#define WRC_NONE 0                     /* No reset will occur */
-#define WRC_CORE 1                     /* Core reset will occur */
-#define WRC_CHIP 2                     /* Chip reset will occur */
-#define WRC_SYSTEM 3                   /* System reset will occur */
-#define TCR_WIE 0x08000000             /* WDT Interrupt Enable */
-#define TCR_PIE 0x04000000             /* PIT Interrupt Enable */
-#define TCR_FP(x) (((x) & 0x3) << 24)  /* FIT Period */
-#define FP_2_9 0                       /* 2^9 clocks */
-#define FP_2_13 1                      /* 2^13 clocks */
-#define FP_2_17 2                      /* 2^17 clocks */
-#define FP_2_21 3                      /* 2^21 clocks */
-#define TCR_FIE 0x00800000             /* FIT Interrupt Enable */
-#define TCR_ARE 0x00400000             /* Auto Reload Enable */
-#define SPRN_THRM1 0x3FC               /* Thermal Management Register 1 */
+#define TCR_WP(x) (((x) &0x3) << 30)  /* WDT Period */
+#define WP_2_17 0                     /* 2^17 clocks */
+#define WP_2_21 1                     /* 2^21 clocks */
+#define WP_2_25 2                     /* 2^25 clocks */
+#define WP_2_29 3                     /* 2^29 clocks */
+#endif                                /* CONFIG_E500 */
+#define TCR_WRC(x) (((x) &0x3) << 28) /* WDT Reset Control */
+#define WRC_NONE 0                    /* No reset will occur */
+#define WRC_CORE 1                    /* Core reset will occur */
+#define WRC_CHIP 2                    /* Chip reset will occur */
+#define WRC_SYSTEM 3                  /* System reset will occur */
+#define TCR_WIE 0x08000000            /* WDT Interrupt Enable */
+#define TCR_PIE 0x04000000            /* PIT Interrupt Enable */
+#define TCR_FP(x) (((x) &0x3) << 24)  /* FIT Period */
+#define FP_2_9 0                      /* 2^9 clocks */
+#define FP_2_13 1                     /* 2^13 clocks */
+#define FP_2_17 2                     /* 2^17 clocks */
+#define FP_2_21 3                     /* 2^21 clocks */
+#define TCR_FIE 0x00800000            /* FIT Interrupt Enable */
+#define TCR_ARE 0x00400000            /* Auto Reload Enable */
+#define SPRN_THRM1 0x3FC              /* Thermal Management Register 1 */
 #define THRM1_TIN (1 << 0)
 #define THRM1_TIV (1 << 1)
 #define THRM1_THRES (0x7f << 2)
@@ -430,26 +430,26 @@ struct pt_regs {
 #ifndef CONFIG_BOOKE
 #define SPRN_TSR 0x3D8 /* Timer Status Register */
 #else
-#define SPRN_TSR 0x150                 /* Book E Timer Status Register */
-#endif                                 /* CONFIG_BOOKE */
-#define TSR_ENW 0x80000000             /* Enable Next Watchdog */
-#define TSR_WIS 0x40000000             /* WDT Interrupt Status */
-#define TSR_WRS(x) (((x) & 0x3) << 28) /* WDT Reset Status */
-#define WRS_NONE 0                     /* No WDT reset occurred */
-#define WRS_CORE 1                     /* WDT forced core reset */
-#define WRS_CHIP 2                     /* WDT forced chip reset */
-#define WRS_SYSTEM 3                   /* WDT forced system reset */
-#define TSR_PIS 0x08000000             /* PIT Interrupt Status */
-#define TSR_FIS 0x04000000             /* FIT Interrupt Status */
-#define SPRN_UMMCR0 0x3A8              /* User Monitor Mode Control Register 0 */
-#define SPRN_UMMCR1 0x3AC              /* User Monitor Mode Control Register 0 */
-#define SPRN_UPMC1 0x3A9               /* User Performance Counter Register 1 */
-#define SPRN_UPMC2 0x3AA               /* User Performance Counter Register 2 */
-#define SPRN_UPMC3 0x3AD               /* User Performance Counter Register 3 */
-#define SPRN_UPMC4 0x3AE               /* User Performance Counter Register 4 */
-#define SPRN_USIA 0x3AB                /* User Sampled Instruction Address Register */
-#define SPRN_XER 0x001                 /* Fixed Point Exception Register */
-#define SPRN_ZPR 0x3B0                 /* Zone Protection Register */
+#define SPRN_TSR 0x150                /* Book E Timer Status Register */
+#endif                                /* CONFIG_BOOKE */
+#define TSR_ENW 0x80000000            /* Enable Next Watchdog */
+#define TSR_WIS 0x40000000            /* WDT Interrupt Status */
+#define TSR_WRS(x) (((x) &0x3) << 28) /* WDT Reset Status */
+#define WRS_NONE 0                    /* No WDT reset occurred */
+#define WRS_CORE 1                    /* WDT forced core reset */
+#define WRS_CHIP 2                    /* WDT forced chip reset */
+#define WRS_SYSTEM 3                  /* WDT forced system reset */
+#define TSR_PIS 0x08000000            /* PIT Interrupt Status */
+#define TSR_FIS 0x04000000            /* FIT Interrupt Status */
+#define SPRN_UMMCR0 0x3A8             /* User Monitor Mode Control Register 0 */
+#define SPRN_UMMCR1 0x3AC             /* User Monitor Mode Control Register 0 */
+#define SPRN_UPMC1 0x3A9              /* User Performance Counter Register 1 */
+#define SPRN_UPMC2 0x3AA              /* User Performance Counter Register 2 */
+#define SPRN_UPMC3 0x3AD              /* User Performance Counter Register 3 */
+#define SPRN_UPMC4 0x3AE              /* User Performance Counter Register 4 */
+#define SPRN_USIA 0x3AB               /* User Sampled Instruction Address Register */
+#define SPRN_XER 0x001                /* Fixed Point Exception Register */
+#define SPRN_ZPR 0x3B0                /* Zone Protection Register */
 
 /* Book E definitions */
 #define SPRN_DECAR 0x036   /* Decrementer Auto Reload Register */
@@ -854,7 +854,7 @@ struct pt_regs {
 #define IOCR_PTD 0x00000400
 #define IOCR_ARE 0x00000080
 #define IOCR_DRC 0x00000020
-#define IOCR_RDM(x) (((x) & 0x3) << 3)
+#define IOCR_RDM(x) (((x) &0x3) << 3)
 #define IOCR_TCS 0x00000004
 #define IOCR_SCS 0x00000002
 #define IOCR_SPC 0x00000001
diff --git a/lib/xcoff.h b/lib/xcoff.h
index 689c570..180b42a 100644
--- a/lib/xcoff.h
+++ b/lib/xcoff.h
@@ -49,4 +49,7 @@ typedef struct _xcoff_fork_header {
 typedef xcoff_header_t xcoff_header64_t;
 typedef xcoff_header_t xcoff_header32_t;
 
+xcoff_header_t* xcoff_parse_metadata(void);
+xcoff_fork_header_t* xcoff_parse_fork_metadata(void);
+
 #endif  // ifndef __XCOFF__
diff --git a/src/neboot-cpu-api.c b/src/neboot-cpu-api.c
index 2491f15..4617343 100644
--- a/src/neboot-cpu-api.c
+++ b/src/neboot-cpu-api.c
@@ -16,5 +16,9 @@ void cb_restart_machine(void) {
   while (1) {
     asm volatile("wfi");
   }
+#else
+  /// @todo add your reset vector here.
+  while (1)
+    ;
 #endif
 }
diff --git a/src/neboot-start.c b/src/neboot-start.c
index b72793e..29a3389 100644
--- a/src/neboot-start.c
+++ b/src/neboot-start.c
@@ -113,7 +113,8 @@ void cb_start_exec(void) {
   } else {
     cb_put_string("CB> Trying EPM partition...\r\n");
 
-    part_block_t* blk = cb_parse_partition_block_at((voidptr_t) NB_FLASH_BASE_ADDR, EPM_PART_BLK_SZ, 0);
+    part_block_t* blk =
+        cb_parse_partition_block_at((voidptr_t) NB_FLASH_BASE_ADDR, EPM_PART_BLK_SZ, 0);
 
     if (blk) {
       cb_pci_append_tree("@stage2-epm", (cb_pci_num_t) blk, sizeof(part_block_t) * blk->num_blocks);
@@ -144,7 +145,7 @@ void cb_start_exec(void) {
   }
 
   /// end of TODO
-  
+
   while (yes) {
     if (__cb_hart_counter == 0) {
       cb_restart_machine();
diff --git a/src/ppc64/ppc64-uart.c b/src/ppc64/ppc64-uart.c
index a26a806..9830342 100644
--- a/src/ppc64/ppc64-uart.c
+++ b/src/ppc64/ppc64-uart.c
@@ -20,7 +20,8 @@ volatile ascii_char_t* const UART0DR = (ascii_char_t*) NB_NS16550_COM1;
 /// @param

 /// @return

 utf_char_t cb_get_char(void) {

-  while (!(*(((volatile uint8_t*) UART0DR) + 0x05) & 0x01));

+  while (!(*(((volatile uint8_t*) UART0DR) + 0x05) & 0x01))

+    ;

   return (utf_char_t) *UART0DR;

 }

 

diff --git a/src/rv64/rv64-uart.c b/src/rv64/rv64-uart.c
index 0fb8ab4..22b0793 100644
--- a/src/rv64/rv64-uart.c
+++ b/src/rv64/rv64-uart.c
@@ -16,7 +16,8 @@ static uint8_t* cb_uart_ptr = (uint8_t*) NB_UART_BASE;
 utf_char_t cb_get_char(void) {
   uintptr_t ptr = NB_UART_BASE;
 
-  while (!(*(((volatile uint8_t*) ptr) + 0x05) & 0x01));
+  while (!(*(((volatile uint8_t*) ptr) + 0x05) & 0x01))
+    ;
 
   return (utf_char_t) *cb_uart_ptr;
 }
diff --git a/vendor/astdx b/vendor/astdx
deleted file mode 160000
-Subproject 44278e2466780e1a014fcb51f0c68cb8a89a48c
diff --git a/vendor/ocl b/vendor/ocl
new file mode 160000
+Subproject b06170354225f19271627df11525857fa34a38e