BOAST 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59589a610dd30134353d9aa38e9ea1de00b43a9a
-  data.tar.gz: 4eec51beee55795b76432c1c4b12502113a7fe3f
+  metadata.gz: 939618b7050d9d0298fa5f06b310ac5a881b85ef
+  data.tar.gz: 60b1fc0bc92e9b1dad4003604a30c9f4de634d87
 SHA512:
-  metadata.gz: a190b47611875b112f027e5b3e4bf292d331f4029ee47d581493fd6d3d4c88d807f98b91887f7602a9e922a2744f48d5965de4f5ce7103597b52886a5eea6f02
-  data.tar.gz: 24c85287f04dae5ce701e11099ef562fb97e81f89fc7ca15105593dee7746a141d1124ab7e1d593193e63f5aeb56bb598a2c986f6c470a91b4fe6b8cfd4c5527
+  metadata.gz: cc1877354a30495b196128bd5e94055808197c14e9e7d6fd9dbb8c1e6c6dc603efbd5a877fd6d64f4d7f12b0fe88a0a8c1801cacb3baf13d206d25740914af4e
+  data.tar.gz: 858093b8d634b8f0ff61f90aa5a2b7a8d67c5b49e9013cdc4093a453095adfaf9ba3490ad8548082b1bd0728cd280184a2ccacf147d94dcdbf541fff124217ec

data/BOAST.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'BOAST'
-  s.version = "1.1.0"
+  s.version = "1.2.0"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://github.com/Nanosim-LIG/boast"

data/lib/BOAST/Language/Case.rb

@@ -75,14 +75,15 @@ module BOAST
     attr_reader :expression
     attr_reader :case_conditions
 
-    def initialize(expression, *control, &block)
+    def initialize(expression, control = {}, &block)
       @expression = expression
       @case_conditions = []
-      control.push(block) if block
-      while control.size >= 2 do
-        @case_conditions.push CaseCondition::new([control.shift].flatten, &(control.shift))
-      end
-      @case_conditions.push CaseCondition::new(&(control.shift)) if control.size > 0
+      default = control.delete(:default)
+      default = block unless default or not block
+      control.each { |key, value|
+        @case_conditions.push CaseCondition::new( [key].flatten, &value )
+      }
+      @case_conditions.push CaseCondition::new( &default ) if default
     end
 
     def get_c_strings

data/lib/BOAST/Language/If.rb

@@ -4,19 +4,20 @@ module BOAST
 
     attr_reader :conditions
 
-    def initialize(*conditions, &block)
-      raise "Illegal if construct!" if conditions.size == 0
-      conditions.push(block) if block
+    def initialize(conditions, &block)
       @conditions = []
       @blocks = []
-      if conditions.size == 1 then
-        @conditions.push conditions.shift
+      if conditions.is_a?(Hash) then
+        else_block = conditions.delete(:else)
+        else_block = block unless else_block or not block
+        conditions.each { |key, value|
+          @conditions.push key
+          @blocks.push value
+        }
+        @blocks.push else_block if else_block
       else
-        while conditions.size >= 2 do
-          @conditions.push conditions.shift
-          @blocks.push conditions.shift
-        end
-        @blocks.push conditions.shift if conditions.size > 0
+        @conditions.push conditions
+        @blocks.push block if block
       end
     end
 

data/lib/BOAST/Language/Intrinsics.rb

@@ -8,15 +8,22 @@ module BOAST
   X86 = 1
   ARM = 2
 
-  native_flags = nil
+  native_flags = []
 
   if OS.mac? then
     native_flags = `sysctl -n machdep.cpu.features`.split
   else
-    native_flags = YAML::load(`cat /proc/cpuinfo`)["flags"].upcase.gsub("_",".").split
+    yaml_cpuinfo = YAML::load(`cat /proc/cpuinfo`)
+    cpuinfo_flags = yaml_cpuinfo["flags"]
+    cpuinfo_flags = yaml_cpuinfo["Features"] unless cpuinfo_flags
+    if cpuinfo_flags then
+      native_flags = cpuinfo_flags.upcase.gsub("_",".").split
+    else
+      warn "Unable to determine architecture flags for native!"
+    end
   end
 
-  MODELS={ "native" => native_flags }
+  MODELS = { "native" => native_flags }
   MODELS.update(X86architectures)
   INSTRUCTIONS = {}
   INSTRUCTIONS.update(X86CPUID_by_name)
@@ -38,11 +45,9 @@ module BOAST
       else
         instruction = INTRINSICS[get_architecture][intr_symbol][type]
       end
+      return instruction if get_architecture == ARM
       raise IntrinsicsError, "Unsupported operation #{intr_symbol} for #{type}#{type2 ? "and #{type2}" : ""} on #{get_architecture_name}!" unless instruction
-      supported = false
-      INSTRUCTIONS[instruction.to_s].each { |flag|
-        supported = true if MODELS[get_model].include?(flag)
-      }
+      supported = (INSTRUCTIONS[instruction.to_s] & MODELS[get_model.to_s]).size > 0
       raise IntrinsicsError, "Unsupported operation #{intr_symbol} for #{type}#{type2 ? "and #{type2}" : ""} on #{get_model}! (requires #{INSTRUCTIONS[instruction.to_s].join(" or ")})" unless supported
       return instruction
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: BOAST
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray