Merge pull request #255 from yui-915/debuginfo2

Add variables debuginfo for gas-x86_64-* targets

Author: rexim

src/b.rs

@@ -180,6 +180,10 @@ pub unsafe fn declare_var(c: *mut Compiler, name: *const c_char, loc: Loc, stora
         return bump_error_count(c);
     }
 
+    if let Storage::Auto {index} = storage {
+        da_append(&mut (*c).func_scope_events, ScopeEvent::Declare {name, index});
+    }
+
     da_append(scope, Var {name, loc, storage});
     Some(())
 }
@@ -286,7 +290,7 @@ impl Binop {
 }
 
 pub unsafe fn push_opcode(opcode: Op, loc: Loc, c: *mut Compiler) {
-    da_append(&mut (*c).func_body, OpWithLocation {opcode, loc});
+    da_append(&mut (*c).func_body, OpWithLocation {opcode, loc, scope_events_count: (*c).func_scope_events.count });
 }
 
 /// Allocator of Auto Vars
@@ -601,14 +605,21 @@ pub unsafe fn compile_expression(l: *mut Lexer, c: *mut Compiler) -> Option<(Arg
 }
 
 pub unsafe fn compile_block(l: *mut Lexer, c: *mut Compiler) -> Option<()> {
+    let index = (*c).func_blocks_count;
+    (*c).func_blocks_count += 1;
+    da_append(&mut (*c).func_scope_events, ScopeEvent::BlockBegin {index});
+
     loop {
         let saved_point = (*l).parse_point;
         lexer::get_token(l)?;
-        if (*l).token == Token::CCurly { return Some(()); }
+        if (*l).token == Token::CCurly { break }
         (*l).parse_point = saved_point;
 
         compile_statement(l, c)?
     }
+
+    da_append(&mut (*c).func_scope_events, ScopeEvent::BlockEnd {index});
+    Some(())
 }
  unsafe fn compile_function_call(l: *mut Lexer, c: *mut Compiler, fun: Arg) -> Option<Arg> {
     let mut args: Array<Arg> = zeroed();
@@ -899,6 +910,8 @@ pub struct Compiler {
     pub func_body: Array<OpWithLocation>,
     pub func_goto_labels: Array<GotoLabel>,
     pub func_gotos: Array<Goto>,
+    pub func_scope_events: Array<ScopeEvent>,
+    pub func_blocks_count: usize,
     pub used_funcs: Array<UsedFunc>,
     pub op_label_count: usize,
     pub switch_stack: Array<Switch>,
@@ -1025,12 +1038,15 @@ pub unsafe fn compile_program(l: *mut Lexer, c: *mut Compiler) -> Option<()> {
                             name,
                             name_loc,
                             body: (*c).func_body,
+                            scope_events: (*c).func_scope_events,
                             params_count,
                             auto_vars_count: (*c).auto_vars_ator.max,
                         });
                         (*c).func_body = zeroed();
                         (*c).func_goto_labels.count = 0;
                         (*c).func_gotos.count = 0;
+                        (*c).func_scope_events = zeroed();
+                        (*c).func_blocks_count = 0;
                         (*c).auto_vars_ator = zeroed();
                         (*c).op_label_count = 0;
                     }