fix bug in reg allocation

Author: csyJoy

-Z

@@ -338,7 +338,8 @@ fn calculate_and_allocate_space(this: &FunctionData, reg_allocator: &HashMap<Val
         if let Some(idx) = opt{
             vec.insert(*idx);
         } else {
-            *sum += 8;
+            *sum += 4;
+            *sum += 4 * this.dfg().value(val.clone()).used_by().len() as i32;
         }
         (sum, vec)
     });
@@ -411,12 +412,12 @@ fn calculate_and_allocate_space(this: &FunctionData, reg_allocator: &HashMap<Val
         let mut m = now_sp_size.lock().unwrap();
         let sp = ((bits + 4 + (arg_count_max * 4) as i32 + 15) / 16) as i32 * 16;
         *m.get_mut() = sp;
-        Caller::Caller((sp, arg_count_max as i32, vec))
+        Caller::Caller((sp, arg_count_max as i32 + vec.len() as i32, vec))
     } else {
         let mut m = now_sp_size.lock().unwrap();
         let sp = ((bits   + (arg_count_max * 4) as i32 + 15) / 16) as i32 * 16;
         *m.get_mut() = sp;
-        Caller::Nocall((sp, arg_count_max as i32, vec))
+        Caller::Nocall((sp, arg_count_max as i32 + vec.len() as i32, vec))
     }
 }
 fn save_and_recover_reg(set: &HashSet<i32>) -> (String, String){

src/code_generator/code_generator.rs

@@ -6,6 +6,7 @@ use std::env::args;
 use std::fs::read_to_string;
 use std::io::{Result, Write};
 use std::fs::File;
+use std::hash::Hash;
 use optim::ControlFlowGraph;
 
 
@@ -76,4 +77,27 @@ fn try_main() -> Result<()> {
     Ok(())
 }
 
+#[test]
+fn test(){
+    // 读取输入文件
+    let input = read_to_string("/Users/csy/testcases/lv5/6_complex_scopes.c").unwrap();
+
+
+    // 调用 lalrpop 生成的 parser 解析输入文件
+    let ast = sysy::CompUnitParser::new().parse(&input).unwrap();
+    let ir = ast.get_koopa();
+    println!("{}", ir);
+    let driver = koopa::front::Driver::from(ir);
+    let program = driver.generate_program().unwrap();
+    // println!("{:#?}", program.func_layout());
+    let a = program.get_interval();
+    let b = program.get_interval();
+    for (func, map_1) in a{
+        for (func, map_2) in b{
+            println!("{}", map_2 == map_1);
+        }
+    }
+
+}
+