- IDA Pro 6.3 support

- The Functions() generator function now accepts function tail start parameter
- Added into idc.py: DbgRead/DbgWrite/SetTargetAssembler and stack pointer related functions
- Wrapped more type info related functions

Author: elias.bachaalany

CHANGES.txt

@@ -1,5 +1,11 @@
 Please see http://code.google.com/p/idapython/source/list for a detailed list of changes.
 
+Changes from version 1.5.4 to 1.5.5
+------------------------------------
+- IDA Pro 6.3 support
+- The Functions() generator function now accepts function tail start parameter
+- Added into idc.py: DbgRead/DbgWrite/SetTargetAssembler and stack pointer related functions
+- Wrapped more type info related functions
 
 Changes from version 1.5.3 to 1.5.4
 ------------------------------------

build.py

@@ -24,7 +24,7 @@
 VERBOSE = True
 
 IDA_MAJOR_VERSION = 6
-IDA_MINOR_VERSION = 2
+IDA_MINOR_VERSION = 3
 
 if 'IDA' in os.environ:
     IDA_SDK = os.environ['IDA']
@@ -36,7 +36,7 @@
 # IDAPython version
 VERSION_MAJOR  = 1
 VERSION_MINOR  = 5
-VERSION_PATCH  = 4
+VERSION_PATCH  = 5
 
 # Determine Python version
 PYTHON_MAJOR_VERSION = int(platform.python_version()[0])
@@ -319,10 +319,11 @@ def build_plugin(platform, idasdkdir, plugin_name, ea64):
         builder = GCCBuilder()
         platform_macros = [ "__LINUX__" ]
         python_libpath = os.path.join(sysconfig.EXEC_PREFIX, "lib")
-        python_library = "-lpython%d.%d" % (PYTHON_MAJOR_VERSION, PYTHON_MINOR_VERSION)
+        python_library = "-Bdynamic -lpython%d.%d" % (PYTHON_MAJOR_VERSION, PYTHON_MINOR_VERSION)
         ida_libpath = os.path.join(idasdkdir, "lib", ea64 and "x86_linux_gcc_64" or "x86_linux_gcc_32")
         ida_lib = ""
-        extra_link_parameters = ""
+        extra_link_parameters = " -s"
+        builder.compiler_parameters += " -O2"
     # Platform-specific settings for the Windows build
     elif platform == "win32":
         builder = MSVCBuilder()
@@ -333,6 +334,7 @@ def build_plugin(platform, idasdkdir, plugin_name, ea64):
         ida_lib = "ida.lib"
         SWIG_OPTIONS += " -D__NT__ "
         extra_link_parameters = ""
+        builder.compiler_parameters += " -Ox"
     # Platform-specific settings for the Mac OS X build
     elif platform == "macosx":
         builder = GCCBuilder()
@@ -342,14 +344,17 @@ def build_plugin(platform, idasdkdir, plugin_name, ea64):
         python_library = "-framework Python"
         ida_libpath = os.path.join(idasdkdir, "lib", ea64 and "x86_mac_gcc_64" or "x86_mac_gcc_32")
         ida_lib = ea64 and "-lida64" or "-lida"
-        extra_link_parameters = ""
+        extra_link_parameters = " -s"
+        builder.compiler_parameters += " -O3"
 
     assert builder, "Unknown platform! No idea how to build here..."
 
     # Enable EA64 for the compiler if necessary
     if ea64:
         platform_macros.append("__EA64__")
 
+    platform_macros.append("NDEBUG")
+
     if not '--no-early-load' in sys.argv:
         platform_macros.append("PLUGINFIX")
 

examples/ex_expr.py

@@ -1,16 +1,16 @@
-# -----------------------------------------------------------------------
-# This is an example illustrating how to extend IDC from Python
-# (c) Hex-Rays
-#
-from idaapi import set_idc_func_ex
-
-#<pycode(ex_expr)>
-def py_power(n, e):
-    return n ** e
-
-ok = set_idc_func_ex("pow", py_power, (idaapi.VT_LONG, idaapi.VT_LONG), 0)
-if ok:
-    print("Now the pow() will be present IDC!")
-else:
-    print("Failed to register pow() IDC function")
-#</pycode(ex_expr)>
+# -----------------------------------------------------------------------
+# This is an example illustrating how to extend IDC from Python
+# (c) Hex-Rays
+#
+from idaapi import set_idc_func_ex
+
+#<pycode(ex_expr)>
+def py_power(n, e):
+    return n ** e
+
+ok = set_idc_func_ex("pow", py_power, (idaapi.VT_LONG, idaapi.VT_LONG), 0)
+if ok:
+    print("Now the pow() will be present IDC!")
+else:
+    print("Failed to register pow() IDC function")
+#</pycode(ex_expr)>

python.cfg

@@ -8,3 +8,7 @@ REMOVE_CWD_SYS_PATH = 0
 // Script timeout (in seconds)
 // (A value of 0 disables the timeout)
 SCRIPT_TIMEOUT = 3
+
+// Use a local Python library
+// If enabled, the "lib" directory tree with modules must be present in IDADIR/python
+USE_LOCAL_PYTHON = 0

python.cpp

@@ -125,6 +125,7 @@ static int    script_timeout = 2;
 static bool   g_ui_ready = false;
 static bool   g_alert_auto_scripts = true;
 static bool   g_remove_cwd_sys_path = false;
+static bool   g_use_local_python    = false;
 
 static void end_execution();
 static void begin_execution();
@@ -369,6 +370,11 @@ const char *idaapi set_python_options(
         g_remove_cwd_sys_path = *(uval_t *)value != 0;
         break;
       }
+      else if ( qstrcmp(keyword, "USE_LOCAL_PYTHON") == 0 )
+      {
+        g_use_local_python = *(uval_t *)value != 0;
+        break;
+      }
     }
     return IDPOPT_BADKEY;
   } while (false);
@@ -466,7 +472,10 @@ static bool IDAPython_ExecFile(const char *FileName, char *errbuf, size_t errbuf
 {
   PyObject *py_execscript = get_idaapi_attr(S_IDAAPI_EXECSCRIPT);
   if ( py_execscript == NULL )
+  {
+    qstrncpy(errbuf, "Could not find idaapi." S_IDAAPI_EXECSCRIPT " ?!", errbufsz);
     return false;
+  }
 
   char script[MAXSTR];
   qstrncpy(script, FileName, sizeof(script));
@@ -1288,6 +1297,25 @@ static void sanitize_path()
   PySys_SetPath(newpath.begin());
 }
 
+
+//-------------------------------------------------------------------------
+// we have to do it ourselves because Python 2.7 calls exit() if importing site fails
+static bool initsite(void)
+{
+  PyObject *m;
+  m = PyImport_ImportModule("site");
+  if (m == NULL)
+  {
+    PyErr_Print();
+    Py_Finalize();
+    return false;
+  }
+  else {
+    Py_DECREF(m);
+  }
+  return true;
+}
+
 //-------------------------------------------------------------------------
 // Initialize the Python environment
 bool IDAPython_Init(void)
@@ -1306,12 +1334,11 @@ bool IDAPython_Init(void)
   char tmp[QMAXPATH];
 #ifdef __LINUX__
   // Export symbols from libpython to resolve imported module deps
-  qsnprintf(tmp, sizeof(tmp), "libpython%d.%d.so.1",
-    PY_MAJOR_VERSION,
-    PY_MINOR_VERSION);
-  if ( !dlopen(tmp, RTLD_NOLOAD | RTLD_GLOBAL | RTLD_LAZY) )
+  // use the standard soname: libpython2.7.so.1.0
+#define PYLIB "libpython" QSTRINGIZE(PY_MAJOR_VERSION) "." QSTRINGIZE(PY_MINOR_VERSION) ".so.1.0"
+  if ( !dlopen(PYLIB, RTLD_NOLOAD | RTLD_GLOBAL | RTLD_LAZY) )
   {
-    warning("IDAPython: %s", dlerror());
+    warning("IDAPython dlopen(" PYLIB ") error: %s", dlerror());
     return false;
   }
 #endif
@@ -1350,16 +1377,31 @@ bool IDAPython_Init(void)
     }
   }
 
+  if ( g_use_local_python )
+    Py_SetPythonHome(g_idapython_dir);
+
+  // don't import "site" right now
+  Py_NoSiteFlag = 1;
+
   // Start the interpreter
   Py_Initialize();
+
   if ( !Py_IsInitialized() )
   {
     warning("IDAPython: Py_Initialize() failed");
     return false;
   }
 
+  // remove current directory
   sanitize_path();
 
+  // import "site"
+  if ( !g_use_local_python && !initsite() )
+  {
+    warning("IDAPython: importing \"site\" failed");
+    return false;
+  }
+
   // Enable multi-threading support
   if ( !PyEval_ThreadsInitialized() )
     PyEval_InitThreads();
@@ -1416,7 +1458,7 @@ bool IDAPython_Init(void)
   parse_plugin_options();
 
   // Register a RunPythonStatement() function for IDC
-  set_idc_func(S_IDC_RUNPYTHON_STATEMENT, idc_runpythonstatement, idc_runpythonstatement_args);
+  set_idc_func_ex(S_IDC_RUNPYTHON_STATEMENT, idc_runpythonstatement, idc_runpythonstatement_args, 0);
 
   // A script specified on the command line is run
   if ( g_run_when == run_on_init )
@@ -1463,7 +1505,7 @@ void IDAPython_Term(void)
   deinit_pywraps();
 
   // Uninstall IDC function
-  set_idc_func(S_IDC_RUNPYTHON_STATEMENT, NULL, NULL);
+  set_idc_func_ex(S_IDC_RUNPYTHON_STATEMENT, NULL, NULL, 0);
 
   // Shut the interpreter down
   Py_Finalize();

python/idautils.py

@@ -217,9 +217,14 @@ def Functions(start=None, end=None):
     if not start: start = idaapi.cvar.inf.minEA
     if not end:   end = idaapi.cvar.inf.maxEA
 
-    func = idaapi.get_func(start)
-    if not func:
-        func = idaapi.get_next_func(start)
+    # find first function head chunk in the range
+    chunk = idaapi.get_fchunk(start)
+    if not chunk:
+        chunk = idaapi.get_next_fchunk(start)
+    while chunk and chunk.startEA < end and (chunk.flags & idaapi.FUNC_TAIL) != 0:
+        chunk = idaapi.get_next_fchunk(chunk.startEA)
+    func = chunk
+
     while func and func.startEA < end:
         startea = func.startEA
         yield startea