daedalus-core 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb568ae793d1465fd93871cf7405e53735bfd723
-  data.tar.gz: ad15e9874523e393217a35c8930dd08cd054ccc6
+  metadata.gz: 8dfabb584ca953d43b3e2fbaef94117cf8d6ad7c
+  data.tar.gz: 16389e1ba87675ed97edd176e3124631d08291cf
 SHA512:
-  metadata.gz: 7f34910a0c15c910753c42a095d57363f8ada6ff57fb1cb7fed6b2af2c4152aebccd35441a7d017617069aab6051a917c495f84d90d178c085e53dc19deb1865
-  data.tar.gz: 347ce6b97068a06020e5b269efd6e0c2bf10dff68346c1a78ece1ecd114d7145a3275f1a5f2d3cc28d3343917adac8fecfcfadebd0890bb77d61369821fb61de
+  metadata.gz: 55eafc6b2e96945051c4fdbab5ffde89c62149e93f2e49681d6e8af53b2785b22ce8f94c35d6e310416612050953b109e748d13730e6bd6121d7b1650d3730f7
+  data.tar.gz: 24815340a8e9209643a49d0db24a5071b0458b1d5c0667372f8a9fcacf24fcabc1e407e39ae3bffc0a2ddd5f597f62306af68e3089f6313b76cabc969bc5b39d

data/lib/daedalus.rb

@@ -476,26 +476,45 @@ module Daedalus
   class InstructionSourceFile < SourceFile
     def ll_compile(ctx, source, object)
       ctx.log.show "LL", source
-      ctx.log.command "#{ctx.cxx} -S -emit-llvm #{ctx.cflags.join(" ")} #{ctx.cxxflags.join(" ")} -c -o #{object} #{source}"
 
-      re = %r[tail call i64 %\d+\(%"class.rubinius::State"\*( nonnull)? %state, %"struct.rubinius::CallFrame"*( nonnull)? %call_frame, i64\* %opcodes\)]
+      flags = (ctx.cflags + ctx.cxxflags).join(" ").
+        gsub(/-g[^ ]*/, "").
+        gsub(/-O.?/, "")
+      flags << " -glldb -gline-tables-only -Oz"
+
+      ctx.log.command "#{ctx.cxx} -S -emit-llvm #{flags} -c -o #{object} #{source}"
+
+      re = %r[tail call i64 %\d+\(%"class.rubinius::State"\*( nonnull)? %state, %"struct.rubinius::CallFrame"\*( nonnull)? %call_frame, i64\*( nonnull)? %opcodes\)]
 
       lines = File.readlines object
-      lines.each do |line|
+
+      i = 0
+      t = lines.size
+
+      while i < t
+        line = lines[i]
         if re =~ line
-          line.sub!(/tail call/, "musttail call")
+          if next_line = lines[i+1] and next_line =~ /^\s+ret\s/
+            line.sub!(/tail call/, "musttail call")
+          end
         end
+        i += 1
       end
 
-      File.open object, "w" do |insn_file|
-        lines.each { |line| insn_file.print line }
+      File.open object, "wb" do |insn_file|
+        lines.each { |l| insn_file.print l }
       end
     end
 
     def cxx_compile(ctx, source, object)
       ctx.log.show "CXX", source
 
-      flags = (ctx.cflags + ctx.cxxflags).join(" ").gsub(/-I[^ ]*/, "")
+      flags = (ctx.cflags + ctx.cxxflags).join(" ").
+        gsub(/-I\s?[^ ]*/, "").
+        gsub(/-g[^ ]*/, "").
+        gsub(/-O.?/, "")
+      flags << " -glldb -gline-tables-only -Oz"
+
       ctx.log.command "#{ctx.cxx} #{flags} -c -o #{object} #{source}"
     end
 

data/lib/daedalus/version.rb

@@ -1,3 +1,3 @@
 module Daedalus
-  VERSION = "1.0"
+  VERSION = "1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daedalus-core
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake