Merge pull request #1203 from ingve/armtests

Build unittests on ARM

Author: fwsGonzo

api/arch

@@ -20,7 +20,6 @@
 #ifndef INCLUDEOS_ARCH_HEADER
 #define INCLUDEOS_ARCH_HEADER
 
-#define ARCH_X86
 #include <cstddef>
 #include <cstdint>
 
@@ -36,6 +35,11 @@ inline uint64_t __arch_cpu_cycles() noexcept {
   asm("rdtsc" : "=A" (ret));
   return ret;
 }
+#else
+inline uint64_t __arch_cpu_cycles() noexcept {
+  return 0;
+}
 #endif
 
 #endif
+

api/hw/ioport.hpp

@@ -6,9 +6,9 @@
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,9 +28,12 @@ namespace hw {
   static inline uint8_t inb(int port)
   {
     int ret;
+#ifdef ARCH_X86
     __asm__ volatile ("xorl %eax,%eax");
     __asm__ volatile ("inb %%dx,%%al":"=a" (ret):"d"(port));
-
+#else
+#warning "inb() not implemented for selected arch"
+#endif
     return ret;
   }
 
@@ -39,7 +42,11 @@ namespace hw {
       @param data : One byte of data to send to @param port
   */
   static inline void outb(int port, uint8_t data) {
+#ifdef ARCH_X86
     __asm__ volatile ("outb %%al,%%dx"::"a" (data), "d"(port));
+#else
+#warning "outb() not implemented for selected arch"
+#endif
   }
 
   /** Receive a word from port.
@@ -48,9 +55,12 @@ namespace hw {
   static inline uint16_t inw(int port)
   {
     int ret;
+#ifdef ARCH_X86
     __asm__ volatile ("xorl %eax,%eax");
     __asm__ volatile ("inw %%dx,%%ax":"=a" (ret):"d"(port));
-
+#else
+#warning "inw() not implemented for selected arch"
+#endif
     return ret;
   }
 
@@ -59,9 +69,14 @@ namespace hw {
       @param data : One word of data to send to @param port
   */
   static inline void outw(int port, uint16_t data) {
+#ifdef ARCH_X86
     __asm__ volatile ("outw %%ax,%%dx"::"a" (data), "d"(port));
+#else
+#warning "outw() not implemented for selected arch"
+#endif
   }
 
 } //< namespace hw
 
 #endif // HW_IOPORT_HPP
+

api/hw/pci.hpp

@@ -28,49 +28,73 @@ namespace hw {
   static inline uint8_t inp(port_t port)
   {
     uint8_t ret;
-  
+#ifdef ARCH_X86
     __asm__ volatile("xorl %eax,%eax");
     __asm__ volatile("inb %%dx,%%al"
                      :"=a"(ret)
                      :"d"(port));
-    return ret;  
+#else
+#warning "inp() not implemented for selected arch"
+#endif
+    return ret;
   }
 
   static inline uint16_t inpw(port_t port)
   {
     uint16_t ret;
+#ifdef ARCH_X86
     __asm__ volatile("xorl %eax,%eax");
     __asm__ volatile("inw %%dx,%%ax"
                      :"=a"(ret)
                      :"d"(port));
-    return ret;    
+#else
+#warning "inpw() not implemented for selected arch"
+#endif
+    return ret;
   }
 
   static inline uint32_t inpd(port_t port)
   {
     uint32_t ret;
+#ifdef ARCH_X86
     __asm__ volatile("xorl %eax,%eax");
     __asm__ volatile("inl %%dx,%%eax"
                      :"=a"(ret)
                      :"d"(port));
-  
+#else
+#warning "inpd() not implemented for selected arch"
+#endif
+
     return ret;
   }
 
 
   static inline void outp(port_t port, uint8_t data)
   {
+#ifdef ARCH_X86
     __asm__ volatile ("outb %%al,%%dx"::"a" (data), "d"(port));
+#else
+#warning "outp() not implemented for selected arch"
+#endif
   }
   static inline void outpw(port_t port, uint16_t data)
   {
+#ifdef ARCH_X86
     __asm__ volatile ("outw %%ax,%%dx"::"a" (data), "d"(port));
+#else
+#warning "outpw() not implemented for selected arch"
+#endif
   }
   static inline void outpd(port_t port, uint32_t data)
   {
+#ifdef ARCH_X86
     __asm__ volatile ("outl %%eax,%%dx"::"a" (data), "d"(port));
+#else
+#warning "outpd() not implemented for selected arch"
+#endif
   }
 
 } //< namespace hw
 
 #endif
+

api/smp

@@ -59,21 +59,21 @@ struct minimal_barrier_t
   {
     __sync_fetch_and_add(&val, 1);
   }
-  
+
   void spin_wait(int max)
   {
     asm("mfence");
     while (this->val < max) {
       asm("pause; nop;");
     }
   }
-  
+
   void reset(int val)
   {
     asm volatile("mfence");
     this->val = val;
   }
-  
+
 private:
   volatile int val = 0;
 };
@@ -131,4 +131,11 @@ public:
 // access a std::array of structs indexed by current CPU id
 #define PER_CPU(x) (per_cpu_help<decltype(x)::value_type, x.size()>(x))
 
+#ifndef ARCH_X86
+typedef int spinlock_t;
+inline void lock(spinlock_t&) {}
+inline void unlock(spinlock_t&) {}
+#endif
+
 #endif
+

api/virtio/virtio.hpp

@@ -215,10 +215,14 @@ class Virtio
        Update the available index */
     inline void update_avail_idx ()
     {
+#ifdef ARCH_X86
       // Std. §3.2.1 pt. 4
       asm volatile("mfence" ::: "memory");
       _queue.avail->idx += _num_added;
       _num_added = 0;
+#else
+#warning "update_avail_idx() not implemented for selected arch"
+#endif
     }
 
     /** Kick hypervisor.
@@ -261,7 +265,7 @@ class Virtio
     {
       return _desc_in_flight;
     }
-    
+
     /** Get number of free tokens in Queue */
     uint16_t num_free() const noexcept
     {
@@ -380,3 +384,4 @@ class Virtio
 };
 
 #endif
+

etc/service.cmake

@@ -38,6 +38,12 @@ option(debug "Build with debugging symbols (OBS: increases binary size)" OFF)
 option(minimal "Build for minimal size" OFF)
 option(stripped "reduce size" OFF)
 
+if ("${ARCH}" STREQUAL "")
+  set (ARCH "ARCH_X86")
+endif("${ARCH}" STREQUAL "")
+
+add_definitions(-D${ARCH})
+
 # Compiler optimization
 set(OPTIMIZE "-O2")
 if (minimal)

src/CMakeLists.txt

@@ -1,6 +1,12 @@
 set(CMAKE_ASM_NASM_OBJECT_FORMAT "elf")
 enable_language(ASM_NASM)
 
+if ("${ARCH}" STREQUAL "")
+  set (ARCH "ARCH_X86")
+endif("${ARCH}" STREQUAL "")
+
+add_definitions(-D${ARCH})
+
 include_directories(${INCLUDEOS_ROOT}/api/posix)
 include_directories(${LIBCXX_INCLUDE_DIR})
 include_directories(${NEWLIB_INCLUDE_DIR})

src/arch/x86/cpu.hpp

@@ -31,28 +31,45 @@ namespace x86
     read_msr(uint32_t addr)
     {
       uint32_t EAX = 0, EDX = 0;
+#ifdef ARCH_X86
       asm volatile("rdmsr": "=a" (EAX),"=d"(EDX) : "c" (addr));
+#else
+#warning "read_msr() not implemented for selected arch"
+#endif
       return ((uint64_t)EDX << 32) | EAX;
     }
-    
+
     static void
     write_msr(uint32_t addr, uint32_t eax, uint32_t edx)
     {
+#ifdef ARCH_X86
       asm volatile("wrmsr" : : "a" (eax), "d"(edx), "c" (addr));
+#else
+#warning "write_msr() not implemented for selected arch"
+#endif
     }
     static void
     write_msr(uint32_t addr, uint64_t value)
     {
+#ifdef ARCH_X86
       asm volatile("wrmsr" : : "A" (value), "c" (addr));
+#else
+#warning "write_msr() not implemented for selected arch"
+#endif
     }
-    
+
     static uint64_t rdtsc()
     {
       uint64_t ret;
+#ifdef ARCH_X86
       asm volatile("rdtsc" : "=A"(ret));
+#else
+#warning "rdtsc() not implemented for selected arch"
+#endif
       return ret;
     }
   };
 }
 
 #endif
+

src/kernel/os.cpp

@@ -224,14 +224,17 @@ uint64_t OS::get_cycles_total() noexcept {
 __attribute__((noinline))
 void OS::halt() {
   *os_cycles_total = cycles_since_boot();
+#ifdef ARCH_X86
   asm volatile("hlt");
 
   // add a global symbol here so we can quickly discard
   // event loop from stack sampling
   asm volatile(
   ".global _irq_cb_return_location;\n"
   "_irq_cb_return_location:" );
-
+#else
+#warning "OS::halt() not implemented for selected arch"
+#endif
   // Count sleep cycles
   *os_cycles_hlt += cycles_since_boot() - *os_cycles_total;
 }
@@ -391,3 +394,4 @@ void OS::legacy_boot() {
     unavail_end += interval;
   }
 }
+

src/kernel/syscalls.cpp

@@ -169,6 +169,7 @@ OS::on_panic_func panic_handler = nullptr;
 **/
 void panic(const char* why)
 {
+#ifdef ARCH_X86
   /// prevent re-entering panic() more than once per CPU
   if (PER_CPU(panic_stuff).reenter)
       OS::reboot();
@@ -210,6 +211,9 @@ void panic(const char* why)
   // .. if we return from the panic handler, go to permanent sleep
   while (1) asm("cli; hlt");
   __builtin_unreachable();
+#else
+#warning "panic() not implemented for selected arch"
+#endif
 }
 
 // Shutdown the machine when one of the exit functions are called
@@ -248,3 +252,4 @@ void _init_syscalls()
   // make sure that the buffers length is zero so it won't always show up in crashes
   _crash_context_buffer[0] = 0;
 }
+