From bbf6b2e54724d9fca5f83ab6c5ff62b9282979ef Mon Sep 17 00:00:00 2001
From: "gergely.erdelyi" <gergely.erdelyi@fccdda4b-c33c-0410-84de-61e1e3e5f415>
Date: Sat, 17 Oct 2009 20:46:51 +0000
Subject: [PATCH] idautils.py: Rearranged function order to be more logical

---
 python/idautils.py | 67 +++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/python/idautils.py b/python/idautils.py
index a0cacd1..c994320 100644
--- a/python/idautils.py
+++ b/python/idautils.py
@@ -246,28 +246,6 @@ def Segments():
             yield seg.startEA
 
 
-def GetDataList(ea, count, itemsize=1):
-    """
-    Get data list - INTERNAL USE ONLY
-    """
-    if itemsize == 1:
-        getdata = idaapi.get_byte
-    elif itemsize == 2:
-        getdata = idaapi.get_word
-    elif itemsize == 4:
-        getdata = idaapi.get_long
-    elif itemsize == 8:
-        getdata = idaapi.get_qword
-    else:
-        raise ValueError, "Invalid data size! Must be 1, 2, 4 or 8"
-
-    endea = ea + itemsize * count
-    curea = ea
-    while curea < endea:
-        yield getdata(curea)
-        curea += itemsize
-
-
 def FuncItems(start):
     """
     Get a list of function items
@@ -316,6 +294,28 @@ def DecodeInstruction(ea):
     return r
 
 
+def GetDataList(ea, count, itemsize=1):
+    """
+    Get data list - INTERNAL USE ONLY
+    """
+    if itemsize == 1:
+        getdata = idaapi.get_byte
+    elif itemsize == 2:
+        getdata = idaapi.get_word
+    elif itemsize == 4:
+        getdata = idaapi.get_long
+    elif itemsize == 8:
+        getdata = idaapi.get_qword
+    else:
+        raise ValueError, "Invalid data size! Must be 1, 2, 4 or 8"
+
+    endea = ea + itemsize * count
+    curea = ea
+    while curea < endea:
+        yield getdata(curea)
+        curea += itemsize
+
+
 def PutDataList(ea, datalist, itemsize=1):
     """
     Put data list - INTERNAL USE ONLY
@@ -359,16 +359,6 @@ def GetInputFileMD5():
     return idc.GetInputMD5()
 
 
-class _cpu(object):
-    "Simple wrapper around GetRegValue/SetRegValue"
-    def __getattr__(self, name):
-        #print "cpu.get(%s)"%name
-        return idc.GetRegValue(name)
-
-    def __setattr__(self, name, value):
-        #print "cpu.set(%s)"%name
-        return idc.SetRegValue(value, name)
-
 class Strings(object):
     """
     Returns the string list.
@@ -418,7 +408,8 @@ class Strings(object):
         idaapi.refresh_strlist(ea1, ea2)
         self.size = idaapi.get_strlist_qty()
 
-    def setup(self, strtypes=STR_C, minlen=5, only_7bit=True, ignore_instructions=False, ea1=idaapi.cvar.inf.minEA, ea2=idaapi.cvar.inf.maxEA, display_only_existing_strings=False):
+    def setup(self, strtypes=STR_C, minlen=5, only_7bit=True, ignore_instructions=False,
+              ea1=idaapi.cvar.inf.minEA, ea2=idaapi.cvar.inf.maxEA, display_only_existing_strings=False):
         t = idaapi.strwinsetup_t()
         t.strtypes = strtypes
         t.minlen = minlen
@@ -479,4 +470,14 @@ def Assemble(ea, line):
     return ret
 
 
+class _cpu(object):
+    "Simple wrapper around GetRegValue/SetRegValue"
+    def __getattr__(self, name):
+        #print "cpu.get(%s)"%name
+        return idc.GetRegValue(name)
+
+    def __setattr__(self, name, value):
+        #print "cpu.set(%s)"%name
+        return idc.SetRegValue(value, name)
+
 cpu = _cpu()