Rename x86 eflags reg to match gdb name

Author: elicn

qiling/arch/x86_const.py

@@ -177,7 +177,7 @@
 }
 
 reg_map_misc = {
-    "ef": UC_X86_REG_EFLAGS, 
+    "eflags": UC_X86_REG_EFLAGS, 
     "cs": UC_X86_REG_CS, 
     "ss": UC_X86_REG_SS,
     "ds": UC_X86_REG_DS, 

qiling/debugger/qdb/arch/arch_x86.py

@@ -21,7 +21,7 @@ def regs(self):
                 "eax", "ebx", "ecx", "edx",
                 "esp", "ebp", "esi", "edi",
                 "eip", "ss", "cs", "ds", "es",
-                "fs", "gs", "ef",
+                "fs", "gs", "eflags",
                 )
 
     def read_insn(self, address: int) -> bytes:
@@ -34,7 +34,7 @@ def read_insn(self, address: int) -> bytes:
     @staticmethod
     def get_flags(bits: int) -> Mapping[str, bool]:
         """
-        get flags from ql.reg.ef
+        get flags from ql.reg.eflags
         """
 
         return {

qiling/debugger/qdb/branch_predictor/branch_predictor_x86.py

@@ -91,7 +91,7 @@ def predict(self):
                 }
 
         if line.mnemonic in jump_table:
-            eflags = self.get_flags(self.ql.arch.regs.ef).values()
+            eflags = self.get_flags(self.ql.arch.regs.eflags).values()
             prophecy.going = jump_table.get(line.mnemonic)(*eflags)
 
         elif line.mnemonic in jump_reg_table:

qiling/debugger/qdb/frontend.py

@@ -389,7 +389,7 @@ def __init__(self, ql):
                 "eax", "ebx", "ecx", "edx",
                 "esp", "ebp", "esi", "edi",
                 "eip", "ss", "cs", "ds", "es",
-                "fs", "gs", "ef",
+                "fs", "gs", "eflags",
                 )
     @context_printer("[ REGISTERS ]")
     def context_reg(self, saved_reg_dump):
@@ -416,7 +416,7 @@ def context_reg(self, saved_reg_dump):
             lines += line
 
         print(lines.format(*cur_regs.values()))
-        print(color.GREEN, "EFLAGS: [CF: {flags[CF]}, PF: {flags[PF]}, AF: {flags[AF]}, ZF: {flags[ZF]}, SF: {flags[SF]}, OF: {flags[OF]}]".format(flags=get_x86_eflags(self.ql.arch.regs.ef)), color.END, sep="")
+        print(color.GREEN, "EFLAGS: [CF: {flags[CF]}, PF: {flags[PF]}, AF: {flags[AF]}, ZF: {flags[ZF]}, SF: {flags[SF]}, OF: {flags[OF]}]".format(flags=get_x86_eflags(self.ql.arch.regs.eflags)), color.END, sep="")
 
     @context_printer("[ DISASM ]", footer=True)
     def context_asm(self):

qiling/debugger/qdb/render/render_x86.py

@@ -22,7 +22,7 @@ def context_reg(self, saved_reg_dump):
         cur_regs = self.dump_regs()
         diff_reg = self.reg_diff(cur_regs, saved_reg_dump)
         self.render_regs_dump(cur_regs, diff_reg=diff_reg)
-        print(color.GREEN, "EFLAGS: [CF: {flags[CF]}, PF: {flags[PF]}, AF: {flags[AF]}, ZF: {flags[ZF]}, SF: {flags[SF]}, OF: {flags[OF]}]".format(flags=self.get_flags(self.ql.arch.regs.ef)), color.END, sep="")
+        print(color.GREEN, "EFLAGS: [CF: {flags[CF]}, PF: {flags[PF]}, AF: {flags[AF]}, ZF: {flags[ZF]}, SF: {flags[SF]}, OF: {flags[OF]}]".format(flags=self.get_flags(self.ql.arch.regs.eflags)), color.END, sep="")
 
     @Render.divider_printer("[ DISASM ]")
     def context_asm(self):

qiling/os/dos/dos.py

@@ -58,10 +58,10 @@ def __del__(self):
             curses.endwin()
 
     def set_flag_value(self, fl: Flags, val: int) -> None:
-        self.ql.arch.regs.ef = self.ql.arch.regs.ef & (~fl) | (fl * val)
+        self.ql.arch.regs.eflags = self.ql.arch.regs.eflags & (~fl) | (fl * val)
 
     def test_flags(self, fl):
-        return self.ql.arch.regs.ef & fl == fl
+        return self.ql.arch.regs.eflags & fl == fl
 
     def set_cf(self):
         self.set_flag_value(Flags.CF, 0b1)

qiling/os/macos/utils.py

@@ -188,5 +188,5 @@ def page_align_end(addr, page_size):
 
 
 def set_eflags_cf(ql, target_cf):
-    ql.arch.regs.ef = ( ql.arch.regs.ef & 0xfffffffe ) | target_cf
-    return ql.arch.regs.ef
+    ql.arch.regs.eflags = ( ql.arch.regs.eflags & 0xfffffffe ) | target_cf
+    return ql.arch.regs.eflags