Merge pull request #41 from UteroOS/restructure-for-libcr-#38

Restructure for libcr #38

REFERENCES.md

@@ -12,6 +12,9 @@ This is a great OS **almost** written in Crystal!
 
 https://github.com/TheKernelCorp/NuummiteOS
 
+### Cyanurus
+https://github.com/redcap97/cyanurus
+
 -----
 
 ### Create Your Own Operating System: Build, deploy, and test your very own operating systems for the Internet of Things and other devices Kindle Edition

src/core/lib_cr.cr

@@ -0,0 +1,35 @@
+# Copyright (c) 2016-2017 Utero OS Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
+
+# This was taken from crystal/src/lib_c.cr
+
+lib LibCR
+  alias Char = UInt8
+  alias UChar = Char
+  alias SChar = Int8
+  alias Short = Int16
+  alias UShort = UInt16
+  alias Int = Int32
+  alias UInt = UInt32
+
+  {% if flag?(:x86_64) || flag?(:aarch64) %}
+    alias Long = Int64
+    alias ULong = UInt64
+  {% elsif flag?(:i686) || flag?(:arm) %}
+    alias Long = Int32
+    alias ULong = UInt32
+  {% end %}
+
+  alias LongLong = Int64
+  alias ULongLong = UInt64
+  alias Float = Float32
+  alias Double = Float64
+
+  $environ : Char**
+end

src/lib_cr/stddef.cr → src/core/lib_cr/x86_64-linux-musl/c/stddef.cr

@@ -7,10 +7,12 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-# from crystal/src/lib_c.cr
+# This was take from
+# crystal/src/lib_c/x86_64-linux-musl/c/stddef.cr
+
+# Lookup core/lib_cr.cr
+require "../../../lib_cr"
+
 lib LibCR
-  alias ULong = UInt64 # for x86_64
   alias SizeT = ULong
-  alias Char = UInt8
-  alias Int = Int32
 end

src/lib_cr/string.cr → src/core/lib_cr/x86_64-linux-musl/c/string.cr

@@ -12,12 +12,14 @@ require "./stddef"
 lib LibCR
   fun memchr(x0 : Void*, c : Int, n : SizeT) : Void*
   fun memcmp(x0 : Void*, x1 : Void*, x2 : SizeT) : Int
-  fun memset(dest : Void*, src : Int, len : SizeT) : Void*
-  fun strchr(x0 : Char*, x1 : Int) : Char*
-  fun strchrnul(x0 : Char*, x1 : Int) : Char*
   fun strcmp(x0 : Char*, x1 : Char*) : Int
   # fun strerror(x0 : Int) : Char*
   fun strlen(x0 : Char*) : SizeT
+
+  # Additional functions
+  fun memset(dest : Void*, src : Int, len : SizeT) : Void*
+  fun strchr(x0 : Char*, x1 : Int) : Char*
+  fun strchrnul(x0 : Char*, x1 : Int) : Char*
   fun strncmp(x0 : Char*, x1 : Char*, n : SizeT) : Int
   fun strstr(x0 : Char*, x1 : Char*) : Char*
 end

src/core/prelude.cr

@@ -8,9 +8,8 @@
 # except according to those terms.
 
 # Order-dependent list
-require "../lib_cr/string"
-require "../lib_cr/ctype"
-require "../lib_cr/bits/**"
+require "./lib_cr"
+require "./lib_cr/**"
 require "./string"
 
 # Alpha-sorted list