Refactor.

Author: sisshiki1969

monoasm/src/jit_memory.rs

@@ -377,7 +377,7 @@ impl JitMemory {
     /// Bind the current location to `label`.
     pub fn bind_label(&mut self, label: DestLabel) {
         let page = self.page;
-        self.labels[label].loc = Some((page, self.counter));
+        self.bind_label_with_page(page, label);
     }
 
     pub fn bind_label_with_page(&mut self, page: Page, label: DestLabel) {
@@ -412,6 +412,7 @@ impl JitMemory {
         let page = self.page;
         let pos = self.counter;
         let target = TargetType::Rel { page, offset, pos };
+        self.emitl(0);
         if let Some((src_page, src_pos)) = self.labels[dest].loc {
             self.write_reloc(src_page, src_pos, target);
         } else {
@@ -423,6 +424,7 @@ impl JitMemory {
     fn save_absolute_reloc(&mut self, page: Page, dest: DestLabel) {
         let pos = self[page].counter;
         let target = TargetType::Abs { page, pos };
+        self[page].emitq(0);
         if let Some((src_page, src_pos)) = self.labels[dest].loc {
             self.write_reloc(src_page, src_pos, target);
         } else {
@@ -490,7 +492,7 @@ impl JitMemory {
                         self[Page(id)].align8();
                         self.bind_label_with_page(Page(id), const_label);
                         self.save_absolute_reloc(Page(id), label);
-                        self[Page(id)].emitq(0);
+                        //self[Page(id)].emitq(0);
                     }
                     DataType::Align8 => {
                         self[Page(id)].align8();
@@ -528,7 +530,7 @@ impl JitMemory {
                         self[DATA_PAGE].align8();
                         self.bind_label_with_page(DATA_PAGE, data_label);
                         self.save_absolute_reloc(DATA_PAGE, label);
-                        self[DATA_PAGE].emitq(0);
+                        //self[DATA_PAGE].emitq(0);
                     }
                     DataType::Align8 => {
                         self[DATA_PAGE].align8();
@@ -662,7 +664,7 @@ impl JitMemory {
     pub fn enc_d(&mut self, op: &[u8], dest: DestLabel) {
         self.emit(op);
         self.save_reloc(dest, 4);
-        self.emitl(0);
+        //self.emitl(0);
     }
 
     /// Encoding: /n  
@@ -883,7 +885,7 @@ impl JitMemory {
             Disp::D32(d) => self.emitl(d as u32),
             Disp::Label(label) => {
                 self.save_reloc(label, 4 + imm.offset());
-                self.emitl(0);
+                //self.emitl(0);
             }
             Disp::None => {}
         }