Changeset 1526

Timestamp:

01/15/08 14:33:04 (8 months ago)

Author:

common

Message:

libemu

• introduce render_array, required for arrays (used in execve() on linux), emu_profile_argument_array_start & emu_profile_argument_array_end
  
• profile alle required calls on linux
  
• some minor fixes in sctest
  

Files:

• libemu/trunk/include/emu/environment/emu_profile.h (modified) (3 diffs)
• libemu/trunk/include/emu/environment/linux/emu_env_linux.h (modified) (2 diffs)
• libemu/trunk/src/environment/emu_profile.c (modified) (5 diffs)
• libemu/trunk/src/environment/linux/emu_env_linux.c (modified) (3 diffs)
• libemu/trunk/src/environment/linux/env_linux_syscall_hooks.c (modified) (9 diffs)
• libemu/trunk/src/environment/win32/env_w32_dll_export_ws2_32_hooks.c (modified) (1 diff)
• libemu/trunk/testsuite/sctest.c (modified) (4 diffs)

libemu/trunk/include/emu/environment/emu_profile.h

@@ -42 +42 @@
-        render_string,
-        render_ip,
-
+
+
-};
-
@@ -64 +65 @@
-                        emu_profile_argument_root *arguments;
-                } tstruct;
+
-                struct
-                {
@@ -119 +121 @@
-void emu_profile_argument_add_ip(struct emu_profile *profile, char *argtype,  char *argname, uint32_t value);
-void emu_profile_argument_add_port(struct emu_profile *profile, char *argtype,  char *argname, uint32_t value);
+void emu_profile_argument_array_start(struct emu_profile* profile, const char* arraytype, const char* arrayname);
+void emu_profile_argument_array_end(struct emu_profile *profile);
+
-
-void emu_profile_function_add(struct emu_profile *profile, char *fnname);

libemu/trunk/include/emu/environment/linux/emu_env_linux.h

@@ -39 +39 @@
-#include "emu/emu_hashtable.h"
-
+struct emu_profile;
-
-struct emu_env_linux
@@ -45 +46 @@
-        struct emu_hashtable *syscall_hooks_by_name;
-        struct emu_env_linux_syscall *syscall_hooks;
+        struct emu_profile *profile;
-};
-

libemu/trunk/src/environment/emu_profile.c

@@ -101 +101 @@
-//      printf("%s %s\n", __PRETTY_FUNCTION__,  structname);
-        struct emu_profile_argument *argument = emu_profile_argument_new(render_struct, structtype, structname);
-
-
-
-
-
+
-        emu_stack_push(profile->argument_stack, argument);
-}
@@ -113 +109 @@
-{
-//      printf("%s %s\n", __PRETTY_FUNCTION__);
+        emu_stack_pop(profile->argument_stack);
+}
+
+void emu_profile_argument_array_start(struct emu_profile* profile, const char* arraytype, const char* arrayname)
+{
+        struct emu_profile_argument *argument = emu_profile_argument_new(render_array, arraytype, arrayname);
+        emu_profile_argument_add(profile, argument);
+        emu_stack_push(profile->argument_stack, argument);
+}
+
+void emu_profile_argument_array_end(struct emu_profile *profile)
+{
-        emu_stack_pop(profile->argument_stack);
-}
@@ -203 +211 @@
-        argument->render = render;
-
-
+ || render == render_array
-        {
-                argument->value.tstruct.arguments = emu_profile_arguments_create();
@@ -236 +244 @@
-                break;
-
+        case render_array:
-        case render_struct:
-                {
@@ -279 +288 @@
-
-                printf("%s };\n", indents(indent));
+                break;
+
+        case render_array:
+                printf("%s %s %s = [\n", indents(indent), argument->argtype, argument->argname);
+                for (argumentit = emu_profile_arguments_first(argument->value.tstruct.arguments); 
+                          !emu_profile_arguments_istail(argumentit); 
+                          argumentit = emu_profile_arguments_next(argumentit))
+                {
+                        emu_profile_argument_debug(argumentit,indent+1);
+                }
+                printf("%s ];\n", indents(indent));
-                break;
-

libemu/trunk/src/environment/linux/emu_env_linux.c

@@ -31 +31 @@
-
-
+#include "emu/environment/emu_profile.h"
-#include "emu/environment/linux/emu_env_linux.h"
-#include "emu/environment/linux/env_linux_syscalls.h"
@@ -52 +53 @@
-        }
-
+        eel->profile = emu_profile_new();
+
-        return eel;
-}
@@ -60 +63 @@
-        emu_hashtable_free(eel->syscall_hooks_by_name);
-        free(eel->syscall_hooks);
+        emu_profile_free(eel->profile);
-        free(eel);
-}

libemu/trunk/src/environment/linux/env_linux_syscall_hooks.c

@@ -38 +38 @@
-#include "emu/emu_memory.h"
-#include "emu/emu_string.h"
-
+
-#include "emu/environment/linux/emu_env_linux.h"
-
@@ -45 +45 @@
-        printf("sys_exit(2)\n");
-        struct emu_cpu *c = emu_cpu_get(env->emu);
+        emu_profile_function_add(env->profile, "exit");
+        emu_profile_argument_add_ptr(env->profile, "int", "status", c->reg[ebx]);
+
-        emu_cpu_reg32_set(c, eax, 0);
-        return 0;
@@ -53 +56 @@
-        printf("sys_fork(2)\n");
-        struct emu_cpu *c = emu_cpu_get(env->emu);
+        emu_profile_function_add(env->profile, "fork");
-        emu_cpu_reg32_set(c, eax, 4711);
-        return 0;
@@ -59 +63 @@
-int32_t env_linux_hook_execve(struct emu_env_linux *env, struct emu_env_linux_syscall *syscall)
-{
-
+
+
+
+
+
+
-        struct emu_string *name = emu_string_new();
-        emu_memory_read_string(emu_memory_get(c->emu), c->reg[ebx], name, 255);
+        emu_profile_argument_add_string(env->profile, "", "", emu_string_char(name));
+//      emu_profile_argument_add_ptr(env->profile, "", "", c->reg[ecx]);
+        emu_profile_argument_array_start(env->profile, "const char *", "argv[]");
+
+        uint32_t p_array = c->reg[ecx];
+        uint32_t p_arg = -1;
+        emu_memory_read_dword(emu_memory_get(c->emu), p_array, &p_arg);
+        int i=1;
+        while (p_arg != 0)
+        {
+                emu_profile_argument_add_ptr(env->profile, "", "", p_array+((i-1)*4));
+                emu_profile_argument_add_ptr(env->profile, "", "", p_arg);
+
+                struct emu_string *arg = emu_string_new();
+                emu_memory_read_string(emu_memory_get(c->emu), p_arg, arg, 128);
+                emu_profile_argument_add_string(env->profile, "", "", emu_string_char(arg));
+                emu_string_free(arg);
+                emu_memory_read_dword(emu_memory_get(c->emu), p_array+(i*4), &p_arg);
+                i++;
+        }
+        emu_profile_argument_add_ptr(env->profile, "", "", p_arg);
+        emu_profile_argument_add_none(env->profile);
+
+//      printf("arg is %s\n", emu_string_char(arg));
+
+
+        emu_profile_argument_array_end(env->profile);
+
+    emu_profile_argument_add_ptr(env->profile, "const char *", "envp[]", c->reg[edx]);
+        emu_profile_argument_add_none(env->profile);
+
+
-        printf("int execve (const char *dateiname=%08x={%s}, const char * argv[], const char *envp[]);\n", 
-                   c->reg[ebx],
-                   emu_string_char(name));
+
+
-        emu_string_free(name);
-        return 0;
@@ -75 +118 @@
-
-        printf("int dup2(int oldfd=%i, int newfd=%i);\n", c->reg[ebx], c->reg[ecx]);
+        emu_profile_function_add(env->profile, "dup2");
+        emu_profile_argument_add_int(env->profile, "int", "oldfd", c->reg[ebx]);
+        emu_profile_argument_add_int(env->profile, "int", "newfd", c->reg[ecx]);
+
-        emu_cpu_reg32_set(c, eax, c->reg[ecx]);
-        return 0;
@@ -105 +152 @@
-                           a[1],
-                           a[2]);
+                emu_profile_function_add(env->profile, "socket");
+                emu_profile_argument_add_int(env->profile, "int", "domain",     a[0]);
+                emu_profile_argument_add_int(env->profile, "int", "type",               a[1]);
+                emu_profile_argument_add_int(env->profile, "int", "protocol",   a[2]);
+
-                emu_cpu_reg32_set(c, eax, 4);
-                break;
@@ -110 +162 @@
-        case 2: // SYS_BIND 
-                {
-
-
-
-
+
+
-                        printf("int bind(int sockfd=%i, struct sockaddr *my_addr=%08x={host %s port %i}, int addrlen);\n",
-                                   a[0],
-                                   a[1], inet_ntoa(*(struct in_addr *)&((struct sockaddr_in *)&sa)->sin_addr), ntohs(((struct sockaddr_in *)&sa)->sin_port) 
-                                  );
-
-emu_cpu_reg32_set(c, eax, 0
-
-
-
-
+
+       emu_profile_function_add(env->profile, "bind"
+
+
+
+
-                        struct sockaddr sa;
-                        memset(&sa, 0, sizeof(struct sockaddr));
-                        emu_memory_read_block(emu_memory_get(c->emu), a[1], &sa, sizeof(struct sockaddr));
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                }
@@ -140 +250 @@
-                           a[0], 
-                           a[1]);
+                emu_profile_function_add(env->profile, "listen");
+                emu_profile_argument_add_int(env->profile, "int", "s", a[0]);
+                emu_profile_argument_add_int(env->profile, "int", "backlog", a[1]);
-                break;
-
@@ -147 +260 @@
-                           a[1],
-                           a[2]);
+
+                emu_profile_function_add(env->profile, "accept");
+                emu_profile_argument_add_int(env->profile, "int", "sockfd", a[0]);
+
+                struct sockaddr sa;
+                memset(&sa, 0, sizeof(struct sockaddr));
+                emu_memory_read_block(emu_memory_get(c->emu), a[1], &sa, sizeof(struct sockaddr));
+
+                emu_profile_argument_add_ptr(env->profile, "sockaddr_in *", "addr", a[1]);
+                emu_profile_argument_add_none(env->profile);
+
+                emu_profile_argument_add_ptr(env->profile, "int", "addrlen", a[2]);
+                emu_profile_argument_add_none(env->profile);
+
+
-                emu_cpu_reg32_set(c, eax, 112);
-                break;

libemu/trunk/src/environment/win32/env_w32_dll_export_ws2_32_hooks.c

@@ -155 +155 @@
-        uint32_t namelen;
-        POP_DWORD(c, &namelen);
+        emu_profile_argument_add_int(env->profile, "int", "namelen", namelen);
-
-        printf("bind(s=%i, name=%x, namelen=%i\n", s, name, namelen);

libemu/trunk/testsuite/sctest.c

@@ -55 +55 @@
-#ifdef HAVE_LIBCARGOS
-#include <cargos-lib.h>
-#include <cargos-lib-static.h>
-#endif
-
@@ -1879 +1878 @@
-
-        emu_profile_debug(env->profile);
+        emu_profile_debug(lenv->profile);
-        
-        emu_env_w32_free(env);
-        emu_env_linux_free(lenv);
-
-
+
+
+
+
+
+
-        return 0;
-}
@@ -2269 +2273 @@
-        int static_offset = CODE_OFFSET;
-        emu_memory_write_block(mem, static_offset, opts.scode,  opts.size);
-
+
-
-
@@ -2275 +2279 @@
-        emu_cpu_eip_set(emu_cpu_get(e), static_offset);
-
+        emu_cpu_reg32_set(emu_cpu_get(e), esp, 0x0012fe98);
+
+        free(opts.scode);
-        return 0;
-