oryx 0.3.1 → 0.3.7

data/README.md

@@ -16,6 +16,14 @@ C-Flat to x86 compiler.
     + Oryx 0.3.1
     + Abstract Syntax Tree defined and generated
     + Fixed Travis errors by pre-compiling LLVM shared library
+- 8 May 13
+    + Oryx 0.3.7
+    + Added mutable values
+    + Introduced negation of integers
+    + `and` and `or` code generation
+    + Improved UX
+    + Debug mode
+
 
 ## C-Flat
 C-Flat is a working subset of C designed for use in compilers courses. C-flat includes expressions, basic control flow, recursive functions, and strict type checking. It is object-compatible with ordinary C and thus can take advantage of the standard C library, at least when using limited types.

data/doc/cflat.md

@@ -7,6 +7,7 @@ C-Flat is a working subset of C designed for use in compilers courses. C-Flat in
  - `boolean`
  - `char`
  - `else`
+ - `false`
  - `if`
  - `int`
  - `print`
@@ -29,6 +30,7 @@ C-Flat ignores whitespace (beyond separating identifiers).
 C-Flat includes many of the arithmetic operators found in C. Here they are enumerated with precedence.
 
     ( )                  grouping            ^   (highest precedence)
+    -                    negation            |
     * /                  multiplication      |
     + -                  addition            |
     < <= >= == !=        comparison          |

data/doc/fibonacci.md

@@ -1,6 +1,6 @@
-# Fibonacci Example
+# Recursive Fibonacci Example
 
-Source Code (`test/data/fib.c`)
+## Source Code (`test/data/fib.c`)
 
     int fib(int x) {
       if (x < 2) return 1;
@@ -11,5 +11,255 @@ Source Code (`test/data/fib.c`)
       return fib(5);
     }
 
-Parse Tree
+## Command
+
+    oryx -v fib.c -o fib.out
+
+## Tokens
+File: `fib.lex`
+
+    TYPE   |  VALUE   |  POSITION
+    -----------------------------------
+    INT                       1,0
+    IDENT        fib          1,4
+    LPAREN                    1,7
+    INT                       1,8
+    IDENT         x          1,12
+    RPAREN                   1,13
+    LCURLY                   1,15
+    IF                        2,2
+    LPAREN                    2,5
+    IDENT         x           2,6
+    LE                        2,8
+    NUM           2          2,10
+    RPAREN                   2,11
+    RETURN                   2,13
+    NUM           1          2,20
+    SEMI                     2,21
+    ELSE                      3,2
+    RETURN                    3,7
+    IDENT        fib         3,14
+    LPAREN                   3,17
+    IDENT         x          3,18
+    MINUS                    3,19
+    NUM           1          3,20
+    RPAREN                   3,21
+    PLUS                     3,22
+    IDENT        fib         3,23
+    LPAREN                   3,26
+    IDENT         x          3,27
+    MINUS                    3,28
+    NUM           2          3,29
+    RPAREN                   3,30
+    SEMI                     3,31
+    RCURLY                    4,0
+    INT                       6,0
+    IDENT        main         6,4
+    LPAREN                    6,8
+    RPAREN                    6,9
+    LCURLY                   6,11
+    RETURN                    7,2
+    IDENT        fib          7,9
+    LPAREN                   7,12
+    NUM           8          7,13
+    RPAREN                   7,14
+    SEMI                     7,15
+    RCURLY                    8,0
+    EOS
+
+## Parse Tree
+Files: `fib.dot`, `fib.jpg`
+
+Command: `dot -Tjpeg fib.dot -o fib.jpg`
+
 ![Parse Tree](img/fib_parse.jpg)
+
+## LLVM IR
+![main function](img/cfgmain.jpg)
+![fib function](img/cfgfib.jpg)
+
+File: `fib.ll`
+
+    ; ModuleID = 'Oryx JIT'
+
+    define i32 @fib(i32 %x) {
+    entry:
+      %x1 = alloca i32
+      store i32 %x, i32* %x1
+      br label %code_block
+
+    code_block:                                       ; preds = %entry
+      %x2 = load i32* %x1
+      %0 = icmp slt i32 %x2, 2
+      %booltmp = sext i1 %0 to i32
+      %ifcond = icmp ne i32 %booltmp, 0
+      br i1 %ifcond, label %then, label %else
+
+    then:                                             ; preds = %code_block
+      br label %merge
+
+    else:                                             ; preds = %code_block
+      %x3 = load i32* %x1
+      %subtmp = sub i32 %x3, 1
+      %calltmp = call i32 @fib(i32 %subtmp)
+      %x4 = load i32* %x1
+      %subtmp5 = sub i32 %x4, 2
+      %calltmp6 = call i32 @fib(i32 %subtmp5)
+      %addtmp = add i32 %calltmp, %calltmp6
+      br label %merge
+
+    merge:                                            ; preds = %else, %then
+      %iftmp = phi i32 [ 1, %then ], [ %addtmp, %else ]
+      br label %phi_bb
+
+    phi_bb:                                           ; preds = %merge
+      %iftmp7 = phi i32 [ %iftmp, %merge ]
+      ret i32 %iftmp7
+    }
+
+    define i32 @main() {
+    entry:
+      br label %code_block
+
+    code_block:                                       ; preds = %entry
+      %calltmp = call i32 @fib(i32 8)
+      br label %phi_bb
+
+    phi_bb:                                           ; preds = %code_block
+      %iftmp = phi i32 [ %calltmp, %code_block ]
+      ret i32 %iftmp
+    }
+
+## x86
+File: `fib.s`
+
+            .section	__TEXT,__text,regular,pure_instructions
+            .globl	_fib
+            .align	4, 0x90
+    _fib:                                   ## @fib
+    Ltmp2:
+    ## BB#0:                                ## %entry
+            pushq	%rbx
+    Ltmp3:
+            subq	$16, %rsp
+    Ltmp4:
+    Ltmp5:
+            movl	%edi, 12(%rsp)
+            movl	$-1, %eax
+            cmpl	$2, 12(%rsp)
+            movl	$0, %ecx
+            cmovll	%eax, %ecx
+            movl	$1, %eax
+            testl	%ecx, %ecx
+            jne	LBB0_2
+    ## BB#1:                                ## %else
+            movl	12(%rsp), %edi
+            decl	%edi
+            callq	_fib
+            movl	%eax, %ebx
+            movl	12(%rsp), %edi
+            addl	$-2, %edi
+            callq	_fib
+            addl	%ebx, %eax
+    LBB0_2:                                 ## %phi_bb
+            addq	$16, %rsp
+            popq	%rbx
+            ret
+    Ltmp6:
+    Leh_func_end0:
+
+            .globl	_main
+            .align	4, 0x90
+    _main:                                  ## @main
+    Ltmp8:
+    ## BB#0:                                ## %entry
+            pushq	%rax
+    Ltmp9:
+            movl	$8, %edi
+            callq	_fib
+            popq	%rdx
+            ret
+    Ltmp10:
+    Leh_func_end1:
+
+
+    .subsections_via_symbols
+            .section	__TEXT,__eh_frame,coalesced,no_toc+strip_static_syms+live_support
+    Ltmp11:
+    EH_frame0:
+    Ltmp13 = (Ltmp12-EH_frame0)-4           ## CIE Length
+            .long	Ltmp13
+            .long	0                       ## CIE ID Tag
+            .byte	1                       ## DW_CIE_VERSION
+            .ascii	 "zR"                   ## CIE Augmentation
+            .byte	0
+            .byte	1                       ## CIE Code Alignment Factor
+            .byte	120                     ## CIE Data Alignment Factor
+            .byte	16                      ## CIE Return Address Column
+            .byte	1                       ## Augmentation Size
+            .byte	16                      ## FDE Encoding = indirect pcrel sdata8
+            .byte	12                      ## DW_CFA_def_cfa
+            .byte	7                       ## Reg 7
+            .byte	8                       ## Offset 8
+            .byte	144                     ## DW_CFA_offset + Reg(16)
+            .byte	1                       ## Offset 1
+            .align	2
+    Ltmp12:
+            .globl	_fib.eh
+    _fib.eh:
+    Ltmp16 = (Ltmp15-Ltmp14)-0              ## FDE Length
+            .long	Ltmp16
+    Ltmp14:
+    Ltmp17 = (Ltmp14-EH_frame0)-0           ## FDE CIE Offset
+            .long	Ltmp17
+    Ltmp18:
+    Ltmp19 = Ltmp2-Ltmp18                   ## FDE initial location
+            .quad	Ltmp19
+    Ltmp20 = (Ltmp6-Ltmp2)-0                ## FDE address range
+            .quad	Ltmp20
+            .byte	0                       ## Augmentation size
+            .byte	4                       ## DW_CFA_advance_loc4
+    Ltmp21 = Ltmp3-Ltmp2
+            .long	Ltmp21
+            .byte	14                      ## DW_CFA_def_cfa_offset
+            .byte	16                      ## Offset 16
+            .byte	4                       ## DW_CFA_advance_loc4
+    Ltmp22 = Ltmp4-Ltmp3
+            .long	Ltmp22
+            .byte	14                      ## DW_CFA_def_cfa_offset
+            .byte	32                      ## Offset 32
+            .byte	4                       ## DW_CFA_advance_loc4
+    Ltmp23 = Ltmp5-Ltmp4
+            .long	Ltmp23
+            .byte	131                     ## DW_CFA_offset + Reg(3)
+            .byte	2                       ## Offset 2
+            .align	3
+    Ltmp15:
+            .globl	_main.eh
+    _main.eh:
+    Ltmp26 = (Ltmp25-Ltmp24)-0              ## FDE Length
+            .long	Ltmp26
+    Ltmp24:
+    Ltmp27 = (Ltmp24-EH_frame0)-0           ## FDE CIE Offset
+            .long	Ltmp27
+    Ltmp28:
+    Ltmp29 = Ltmp8-Ltmp28                   ## FDE initial location
+            .quad	Ltmp29
+    Ltmp30 = (Ltmp10-Ltmp8)-0               ## FDE address range
+            .quad	Ltmp30
+            .byte	0                       ## Augmentation size
+            .byte	4                       ## DW_CFA_advance_loc4
+    Ltmp31 = Ltmp9-Ltmp8
+            .long	Ltmp31
+            .byte	14                      ## DW_CFA_def_cfa_offset
+            .byte	16                      ## Offset 16
+            .align	3
+            .align	3
+    Ltmp25:
+
+## Return Value
+
+    $ echo $?
+    34
+
+

data/doc/intro.md

@@ -7,8 +7,9 @@
 - Produce tokens from source code (Oryx 0.1.1)
 - Create parse tree from token stream (Oryx 0.2.1)
 - Symbol Table working (Oryx 0.2.7)
-- Translate parse tree into AST (Oryx ?.?.?)
-- Emit LLVM intermediate code by walking AST (Oryx ?.?.?)
+- Translate parse tree into AST (Oryx 0.3.1)
+- Emit LLVM intermediate code by walking AST (Oryx 0.3.7)
+- Loops and Printing (Oryx ?.?.?)
 - Implement Semantic Analysis (Oryx ?.?.?)
 - Use LLVM optimizations (Oryx ?.?.?)
 - Improved error handling (Oryx ?.?.?)

data/lib/oryx/ast.rb

@@ -7,6 +7,14 @@ module Oryx
     value :value, Integer
   end
 
+  class Cstring < Expression
+    value :value, String
+  end
+
+  class BoolConst < Expression
+    value :value, Symbol
+  end
+
   class Type < Expression
     value :t, String
   end
@@ -21,6 +29,12 @@ module Oryx
     child :right, Expression
   end
 
+  class Uniary < Expression
+    child :right, Expression
+  end
+
+  class Neg < Uniary; end
+
   class Initialization < Expression
     value :name, String
     child :right, Expression
@@ -63,8 +77,10 @@ module Oryx
   class GEQ < Binary; end
   class LE  < Binary; end
   class LEQ < Binary; end
-  class EQ < Binary; end
+  class EQ  < Binary; end
   class NEQ < Binary; end
+  class And < Binary; end
+  class Or  < Binary; end
 
   class Return < Expression
     child :right, Expression

data/lib/oryx/contractor.rb

@@ -17,6 +17,7 @@ module Oryx
       super
       @module = RLTK::CG::Module.new('Oryx JIT')
       @st = SymbolTable.new
+      @branch_needed = true
     end
 
     def begin ast
@@ -32,14 +33,19 @@ module Oryx
         param_types = parameter_types node.params
         return_type = visit node.return_type
         fun = @module.functions.add(node.i, return_type, param_types)
-        node.params.params.each {|p| visit p}
         param_names = parameter_names node.params
         param_names.each_with_index do |name, i|
-          st.update name.to_sym, fun.params[i]
+          fun.params[i].name = name
         end
       end
-
-      ret (visit node.body, at: fun.blocks.append('entry'))
+      build(fun.blocks.append('entry')) do
+        fun.params.each do |param|
+          loc = alloca RLTK::CG::NativeIntType, param.name
+          st.insert param.name, loc
+          store param, loc
+        end
+        ret ( visit node.body )
+      end
       st.exit_scope
 
       returning(fun) { fun.verify }
@@ -54,15 +60,35 @@ module Oryx
 
     on Variable do |node|
       begin
-        st.lookup node.name.to_sym
+       self.load (st.lookup node.name.to_sym), node.name
       rescue SymbolTableError => e
         STDERR.puts e.message, "Attempting to continue without this value."
       end
     end
 
     on CodeBlock do |node|
-      a = node.statements.map {|s| visit s}
-      a.first
+      st.enter_scope
+      start = current_block
+      fun = start.parent
+      b = fun.blocks.append('code_block')
+      value = ''
+      next_b = [b]
+      node.statements.each_with_index do |s, i|
+        value, new_b = visit s, at: next_b.last, rcb: true
+        if new_b != b
+          build(next_b.last) { br new_b} if @branch_needed and i != node.statements.count-1
+          @branch_needed = true
+          next_b << new_b
+        end
+      end
+
+
+      phi_bb = fun.blocks.append('phi_bb', self)
+      phi_inst = build(phi_bb) { phi RLTK::CG::NativeIntType, { next_b.last=> value, next_b.last => value}, 'iftmp' }
+      build(start) { br b }
+      build(next_b.last) { br phi_bb }
+      st.exit_scope
+      returning(phi_inst) { target phi_bb }
     end
 
     on Return do |node|
@@ -85,6 +111,8 @@ module Oryx
       when LEQ then integer_cast(icmp(:sle, left, right), RLTK::CG::NativeIntType, 'booltmp')
       when EQ  then integer_cast(icmp(:eq, left, right), RLTK::CG::NativeIntType, 'booltmp')
       when NEQ then integer_cast(icmp(:ne, left, right), RLTK::CG::NativeIntType, 'booltmp')
+      when And then integer_cast((build_inst :and, left, right), RLTK::CG::NativeIntType, 'andtmp')
+      when Or  then integer_cast((build_inst :or, left, right), RLTK::CG::NativeIntType, 'ortmp')
       end
     end
 
@@ -92,11 +120,37 @@ module Oryx
       RLTK::CG::NativeInt.new(node.value)
     end
 
+    on BoolConst do |node|
+      int_val = (node.value == :true) ? 1 : 0
+      RLTK::CG::Int1.new(int_val)
+    end
+
+    on Neg do |node|
+      right = visit node.right
+      sub(ZERO, right, 'negtmp')
+    end
+
     on GInitialization do |node|
       name = node.name.to_sym
       value = visit node.right
+      loc = alloca RLTK::CG::NativeIntType, name.to_s
+      puts "#{name} -> #{loc}"
+      begin
+        st.insert(name, loc)
+      rescue SymbolTableError => e
+        STDERR.puts e.message, "Continuing processing without modifying the symbol table"
+      end
+      puts "#{name} -> #{st.lookup name}"
+      store value, loc
+    end
+
+    on Initialization do |node|
+      name = node.name.to_sym
+      value = visit node.right
+      loc = alloca RLTK::CG::NativeIntType, name.to_s
       begin
-        st.insert(name, value)
+        st.insert(name, loc)
+        store value, loc
       rescue SymbolTableError => e
         STDERR.puts e.message, "Continuing processing without modifying the symbol table"
       end
@@ -104,8 +158,9 @@ module Oryx
 
     on GDeclaration do |node|
       name = node.name.to_sym
+      loc = alloca RLTK::CG::NativeIntType, name.to_s
       begin
-        st.insert name
+        st.insert name, loc
       rescue SymbolTableError => e
         STDERR.puts e.message, "Continuing processing without modifying the symbol table"
       end
@@ -113,8 +168,9 @@ module Oryx
 
     on Declaration do |node|
       name = node.name.to_sym
+      loc = alloca RLTK::CG::NativeIntType, name.to_s
       begin
-        st.insert name
+        st.insert name, loc
       rescue SymbolTableError => e
         STDERR.puts e.message, "Continuing processing without modifying the symbol table"
       end
@@ -124,7 +180,9 @@ module Oryx
       value = visit node.right
       name = node.name.to_sym
       begin
-        st.update name, value
+        loc = st.lookup name
+        store value, loc
+        self.load loc, name.to_s
       rescue SymbolTableError => e
         STDERR.puts e.message, "Continuing processing witout modifying the symbol table"
       end
@@ -155,6 +213,7 @@ module Oryx
       build(start_bb) { cond cond_val, then_bb, else_bb }
       build(new_then_bb) { br merge_bb }
       build(new_else_bb) { br merge_bb }
+      @branch_needed = false
       returning(phi_inst) { target merge_bb }
     end
 

data/lib/oryx/options.rb

@@ -4,12 +4,15 @@ require 'pathname'
 module Oryx
   class Options
     DEFAULT_INPUT = ""
-    DEFAULT_OUTPUT = Pathname.new("/tmp/oryx-output")
+    DEFAULT_OUTPUT = Pathname.new "a.out"
 
     def initialize(argv)
-      @config = {output: DEFAULT_OUTPUT,
-                 input:  DEFAULT_INPUT}
+      @config = {output:  DEFAULT_OUTPUT,
+                 input:   DEFAULT_INPUT,
+                 verbose: false}
+
       parse(argv)
+
       begin
         input = Pathname.new(argv.pop).expand_path
         @config[:input] = input
@@ -37,6 +40,9 @@ module Oryx
         opts.on("-o", "--output FILE", String, "Output filename") do |path|
           @config[:output] = Pathname.new(path).expand_path
         end
+        opts.on("-v", "--verbose", "Auxilary information about compilation process") do
+          @config[:verbose] = true
+        end
 
         begin
           argv = ["-h"] if argv.empty?

data/lib/oryx/parser.rb

@@ -94,7 +94,7 @@ module Oryx
       clause('e SEMI') { |e, _| e }
       clause('if_statement') { |i| i}
       clause('WHILE LPAREN e RPAREN code_block') {|_,_,e,_,c| While.new(e,c) }
-      clause('type_spec IDENT ASSIGN e SEMI')         { |t, e0, _, e1, _| Initialization.new t, e0, e1 }
+      clause('type_spec IDENT ASSIGN e SEMI')         { |t, e0, _, e1, _| Initialization.new e0, e1, t }
       clause('type_spec IDENT SEMI')                  { |t, i, _ | Declaration.new i,t }
     end
 
@@ -118,6 +118,7 @@ module Oryx
       clause('constant') { |c| c }
       clause('IDENT ASSIGN e') { |e0, _, e1| Assign.new e0, e1 }
 
+      clause('MINUS e')   { |_, e|      Neg.new(e) }
       clause('e PLUS e')  { |e0, _, e1| Add.new(e0, e1) }
       clause('e MINUS e') { |e0, _, e1| Sub.new(e0, e1) }
       clause('e TIMES e') { |e0, _, e1| Mul.new(e0, e1) }
@@ -128,13 +129,16 @@ module Oryx
       clause('e LEQ e')   { |e0, _, e1| LEQ.new(e0, e1) }
       clause('e EQ e')    { |e0, _, e1| EQ.new(e0, e1) }
       clause('e NEQ e')   { |e0, _, e1| NEQ.new(e0, e1) }
+      clause('e AND e')   { |e0, _, e1| And.new(e0, e1) }
+      clause('e OR e')    { |e0, _, e1| Or.new(e0, e1) }
 
+      clause('TRUE')      { |t| BoolConst.new (:true) }
+      clause('FALSE')      { |t| BoolConst.new (:false) }
 
       clause('RETURN e')  { |_, e| Return.new e }
 
       clause('IDENT LPAREN opt_arg_list RPAREN') { |i, _, oal, _| Call.new(i, oal) }
     end
 
-    finalize explain: 'explain.out'
   end
 end

data/lib/oryx/runner.rb

@@ -9,30 +9,68 @@ module Oryx
       @options = Options.new argv
       @input_filename  = @options.input
       @output_filename = @options.output
+      @verbose = @options.verbose
     end
 
     def run
       puts "input:  #{input_filename}"
       puts "output: #{output_filename}"
-      print "lexing".blue+"."*17
-      l = Lexer.new
-      output_filename.open('w:UTF-8') { |f| f.write(tabularize_output l.lex_file(input_filename.to_s)) }
-      puts "complete".green
 
-      p = Parser.new
-      ast = p.parse(l.lex_file(input_filename.to_s), parse_tree: 'tree.dot', verbose: 'parse.out')
+      tokens = lex input_filename
+      ast    = parse tokens
+      generate ast
+    end
+
+    private
+      def lex code
+        STDERR.print "lexing".blue+"."*17
+        l = Lexer.new
+        tokens = l.lex_file(code)
+        output("lex") { tabularize_output tokens }
+        STDERR.puts "complete".green
+        tokens
+      end
 
-      c = Contractor.new
-      c.begin ast
+      def parse tokens=[]
+        STDERR.print "parsing".blue+"."*17
+        finalize_parser
+        p = Parser.new
+        parse_flags = Hash.new
+        parse_flags.merge!( {
+                            parse_tree: name("parse.dot"),
+                            verbose:    name("parse.log")
+                           }
+                          ) if @verbose
+        ast = p.parse(tokens, parse_flags)
+        STDERR.puts "complete".green
+        ast
+      end
 
-      output_ir c.module
+      def generate ast
+        STDERR.print "generating".blue+"."*17
+        c = Contractor.new
+        c.begin ast
 
-      translate_to_assembly
-      create_executable
+        output_ir c.module
 
-    end
+        translate_to_assembly
+        create_executable
+        STDERR.puts "complete".green
+      end
+
+      def finalize_parser
+        if 0 == Parser.class_eval { @states.length }
+          if @verbose
+            explain_file = name("parse")
+            Parser.class_eval do
+              finalize explain: explain_file
+            end
+          else
+            Parser.class_eval { finalize }
+          end
+        end
+      end
 
-    private
       def tabularize_output tokens
         s = table_header
         tokens.each do |t|
@@ -51,6 +89,17 @@ module Oryx
         input_filename.to_s.split('.').first
       end
 
+      def name extension
+        "#{base_name}.#{extension.to_s}"
+      end
+
+      def output extension
+        if @verbose
+          file = Pathname.new name(extension)
+          file.open('w:UTF-8') { |f| f.write (yield) }
+        end
+      end
+
       def output_ir ir_module
         ir_module.verify
         orig_stderr = $stderr.clone
@@ -60,11 +109,11 @@ module Oryx
       end
 
       def translate_to_assembly
-        `llc -disable-cfi #{base_name}.ll`
+        `llc -disable-cfi #{name "ll"}`
       end
 
       def create_executable
-        `gcc #{base_name}.s -o #{base_name}.out`
+        `gcc #{base_name}.s -o #{output_filename}`
       end
 
       def table_header

data/lib/oryx/version.rb

@@ -1,3 +1,3 @@
 module Oryx
-  VERSION = "0.3.1"
+  VERSION = "0.3.7"
 end

data/test/data/and.c

@@ -0,0 +1,14 @@
+int test_and(int a, int b, int c){
+  if(a < b && b > c)
+    return 5;
+  else
+    return 4;
+}
+
+int main(){
+  int a = 7;
+  int b = 8;
+  int c = 1;
+
+  return test_and(a, b, c);
+}

data/test/data/and2.c

@@ -0,0 +1,14 @@
+int test_and(int a, int b, int c){
+  if(a < b && b > c)
+    return 5;
+  else
+    return 4;
+}
+
+int main(){
+  int a = 7;
+  int b = 8;
+  int c = 1;
+
+  return test_and(c,a,b);
+}

data/test/data/fun_2.c

@@ -0,0 +1,9 @@
+int fun_2(int a, int b){
+  int c;
+  c = a + b;
+  return c;
+}
+
+int main(){
+  return fun_2(12,13);
+}

data/test/data/fun_3.c

@@ -0,0 +1,11 @@
+int fun_3(int a, int b) {
+  int c = a*a;
+  int d = 2*a*b;
+  int e = b*b;
+  int sum = c + d + e;
+  return sum;
+}
+
+int main(){
+  return fun_3(5,6);
+}

data/test/data/fun_4.c

@@ -0,0 +1,9 @@
+int f(int a){
+  return a+1;
+}
+
+int main(){
+  int a = 7;
+  return f(a);
+}
+

data/test/data/gvar_1.c

@@ -1,5 +1,6 @@
-int a = 7;
+int a;
 
 int main(){
+  a = 7;
   return a;
 }

data/test/data/if.c

@@ -2,7 +2,7 @@ int a = 8;
 int b = 13;
 
 int main(){
-  if(a < b){
+  if(a > b){
     a = a + b;
     b = 1;
     if (b < a)

data/test/data/if_2.c

@@ -0,0 +1,15 @@
+int a = 8;
+int b = 13;
+
+int main(){
+  if(a < b){
+    a = a + b;
+    b = 1;
+    if (b > a)
+      return b;
+    else
+      return a;
+  }
+  else
+    return a;
+}

data/test/data/if_3.c

@@ -0,0 +1,20 @@
+int main(){
+  int a = 8;
+  int b = 13;
+  int c;
+
+  if(a < b){
+    c = a;
+  }else{
+    c = b;
+  }
+
+  if(b < c){
+    c = c + b;
+  }
+  else{
+    c = c + a;
+  }
+
+  return c;
+}

data/test/data/if_4.c

@@ -0,0 +1,20 @@
+int main(){
+  int a = 8;
+  int b = 13;
+  int c;
+
+  if(a < b){
+    c = a;
+  }else{
+    c = b;
+  }
+
+  if(b > c){
+    c = c + b;
+  }
+  else{
+    c = c + a;
+  }
+
+  return c;
+}

data/test/data/long.c

@@ -0,0 +1,30 @@
+int main(){
+  int a = 1;
+  int b = 2;
+  int c = 3;
+  int d = 4;
+  int e = 5;
+  int f = 6;
+  int g = 7;
+  int h = 8;
+  int j = 9;
+  int i = 10;
+  int k = 11;
+  int l = 12;
+  int m = 13;
+  int n = 14;
+  int o = 15;
+  int p = 16;
+  int q = 17;
+  int r = 18;
+  int s = 19;
+  int t = 20;
+  int u = 21;
+  int v = 22;
+  int w = 23;
+  int x = 24;
+  int y = 25;
+  int z = 26;
+
+  return z;
+}

data/test/data/mut.c

@@ -0,0 +1,9 @@
+int main(){
+  int a = 5;
+  int b;
+  b = 9;
+  b = b + a;
+  a = a* b;
+  b = a - b;
+  return a + 2*b;
+}

data/test/data/neg.c

@@ -0,0 +1,3 @@
+int main(){
+  return -1;
+}

data/test/data/neg2.c

@@ -0,0 +1,5 @@
+int main(){
+  int a = 1;
+  int b = -a - 10;
+  return b;
+}

data/test/data/neg3.c

@@ -0,0 +1,6 @@
+int main(){
+  int a = 42;
+  int b = 8;
+  int c = a - -b;
+  return c;
+}

data/test/data/neg4.c

@@ -0,0 +1,5 @@
+int main(){
+  int a = 13;
+
+  return ---------a;
+}

data/test/data/or.c

@@ -0,0 +1,10 @@
+int test_or(int a, int b, int c){
+  if(a < b || b < c)
+    return a;
+  else
+    return c;
+}
+
+int main(){
+  return test_or(9, -5, 3);
+}

data/test/data/or2.c

@@ -0,0 +1,10 @@
+int test_or(int a, int b, int c){
+  if(a < b || b < c)
+    return a;
+  else
+    return c;
+}
+
+int main(){
+  return test_or(9, 5, 3);
+}

data/test/lib/oryx/runner_test.rb

@@ -8,18 +8,34 @@ module Oryx
       should_generate_toolchain_output("sub", (-7)%256)
       should_generate_toolchain_output("mul", 175)
       should_generate_toolchain_output("div", 2)
-      should_generate_toolchain_output("gvar_1", 7)
-      should_generate_toolchain_output("gvar_2", 42)
-      should_generate_toolchain_output("gvar_3", 15)
+#      should_generate_toolchain_output("gvar_1", 7)
+#      should_generate_toolchain_output("gvar_2", 42)
+#      should_generate_toolchain_output("gvar_3", 15)
       should_generate_toolchain_output("fun_1", 9)
+      should_generate_toolchain_output("fun_2", 25)
+      should_generate_toolchain_output("fun_3", 121)
+      should_generate_toolchain_output("fun_4", 8)
       should_generate_toolchain_output("ge", 7)
       should_generate_toolchain_output("le", 8)
       should_generate_toolchain_output("leq", 15)
       should_generate_toolchain_output("geq", 9)
       should_generate_toolchain_output("eq", 5)
       should_generate_toolchain_output("neq", 4)
-      should_generate_toolchain_output("if", 21)
+#      should_generate_toolchain_output("if", 1)
+#      should_generate_toolchain_output("if_2", 21)
+      should_generate_toolchain_output("if_3", 16)
+      should_generate_toolchain_output("if_4", 21)
       should_generate_toolchain_output("fib", 34)
+      should_generate_toolchain_output("neg", (-1)%256)
+      should_generate_toolchain_output("neg2", (-11)%256)
+      should_generate_toolchain_output("neg3", 50)
+      should_generate_toolchain_output("neg4", (-13)%256)
+      should_generate_toolchain_output("and", 5)
+      should_generate_toolchain_output("and2", 4)
+      should_generate_toolchain_output("or", 9)
+      should_generate_toolchain_output("or2", 3)
+      should_generate_toolchain_output("mut", 182)
+      should_generate_toolchain_output("long", 26)
     end
   end
 end

data/test/shoulda_macros/runner.rb

@@ -10,25 +10,19 @@ module Oryx
           teardown_helper base_name
         end
 
-        should "create LLVM IR" do
+        should "create files" do
           path = @directory + "#{@base_name}.ll"
           assert path.exist?, "#{path} was not created"
-        end
 
-        should "translate IR into Assembly" do
           path = @directory + "#{@base_name}.s"
           assert path.exist?, "#{path} was not created"
-        end
 
-        should "create executable" do
           path = @directory + "#{@base_name}.out"
           assert path.exist?, "#{path} was not created"
           assert path.executable?, "#{path} is not an executable"
-        end
 
-        should "return the correct result" do
           path = @directory + "#{@base_name}.out"
-          assert_equal return_value, %x[#{path}; echo $?].to_i
+          assert_equal return_value, %x[#{path}; echo $?].to_i, "Wrong result returned"
         end
       end
     end
@@ -47,12 +41,15 @@ module Oryx
       def setup_helper file
         @directory = Pathname.new "test/data/"
         @base_name = file
-        r = Runner.new [(@directory+"#{@base_name}.c")]
+        r = Runner.new [(@directory+"#{@base_name}.c"), "-o", (@directory+"#{@base_name}.out").to_s]
         stfu {r.run}
       end
 
       def teardown_helper file
-        %w[ll s out].each { |e| (@directory+"#{@base_name}.#{e}").delete }
+        %w[ll s out].each do |e|
+          path = @directory+"#{@base_name}.#{e}"
+          path.delete if path.exist?
+        end
       end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oryx
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,6 +94,8 @@ files:
 - doc/cflat.md
 - doc/conclusion.md
 - doc/fibonacci.md
+- doc/img/cfgfib.jpg
+- doc/img/cfgmain.jpg
 - doc/img/fib_parse.jpg
 - doc/intermediate_lang.md
 - doc/intro.md
@@ -114,20 +116,36 @@ files:
 - lib/oryx/version.rb
 - oryx.gemspec
 - test/data/add.c
+- test/data/and.c
+- test/data/and2.c
 - test/data/div.c
 - test/data/eq.c
 - test/data/fib.c
 - test/data/fun_1.c
+- test/data/fun_2.c
+- test/data/fun_3.c
+- test/data/fun_4.c
 - test/data/ge.c
 - test/data/geq.c
 - test/data/gvar_1.c
 - test/data/gvar_2.c
 - test/data/gvar_3.c
 - test/data/if.c
+- test/data/if_2.c
+- test/data/if_3.c
+- test/data/if_4.c
 - test/data/le.c
 - test/data/leq.c
+- test/data/long.c
 - test/data/mul.c
+- test/data/mut.c
+- test/data/neg.c
+- test/data/neg2.c
+- test/data/neg3.c
+- test/data/neg4.c
 - test/data/neq.c
+- test/data/or.c
+- test/data/or2.c
 - test/data/return.c
 - test/data/sub.c
 - test/lib/oryx/error_test.rb
@@ -152,7 +170,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1968373242303314984
+      hash: 2494793455272379608
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -161,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1968373242303314984
+      hash: 2494793455272379608
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -170,20 +188,36 @@ specification_version: 3
 summary: Take a program written in C-Flat and convert it to x86 assembly
 test_files:
 - test/data/add.c
+- test/data/and.c
+- test/data/and2.c
 - test/data/div.c
 - test/data/eq.c
 - test/data/fib.c
 - test/data/fun_1.c
+- test/data/fun_2.c
+- test/data/fun_3.c
+- test/data/fun_4.c
 - test/data/ge.c
 - test/data/geq.c
 - test/data/gvar_1.c
 - test/data/gvar_2.c
 - test/data/gvar_3.c
 - test/data/if.c
+- test/data/if_2.c
+- test/data/if_3.c
+- test/data/if_4.c
 - test/data/le.c
 - test/data/leq.c
+- test/data/long.c
 - test/data/mul.c
+- test/data/mut.c
+- test/data/neg.c
+- test/data/neg2.c
+- test/data/neg3.c
+- test/data/neg4.c
 - test/data/neq.c
+- test/data/or.c
+- test/data/or2.c
 - test/data/return.c
 - test/data/sub.c
 - test/lib/oryx/error_test.rb