Changeset 1551

Timestamp:

02/14/08 13:54:47 (8 months ago)

Author:

common

Message:

libemu

• void *emu_profile_function_argument_get(struct emu_profile_function *function, int argc);
  added, expected to work
  
• emu_profile supports shorts
  
• sctest, minor changes, try to reestablisch getpctest()
  
• scprofiler, testdummy for emu_profile_function_argument_get()
  

Files:

• libemu/trunk/include/emu/environment/emu_profile.h (modified) (4 diffs)
• libemu/trunk/src/environment/emu_profile.c (modified) (16 diffs)
• libemu/trunk/src/environment/win32/env_w32_dll_export_ws2_32_hooks.c (modified) (2 diffs)
• libemu/trunk/testsuite/Makefile.am (modified) (2 diffs)
• libemu/trunk/testsuite/scprofiler.c (added)
• libemu/trunk/testsuite/sctest.c (modified) (16 diffs)

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

@@ -39 +39 @@
-        render_ptr,
-        render_int,
+        render_short,
-        render_struct,
-        render_string,
@@ -59 +60 @@
-        union
-        {
-
+
+
+
-                char *tchar;
-                struct 
@@ -120 +123 @@
-void emu_profile_function_debug(struct emu_profile_function *function);
-
+void emu_profile_argument_debug(struct emu_profile_argument *argument, int indent);
+
-void emu_profile_argument_add_none(struct emu_profile *profile);
-void emu_profile_argument_add_int(struct emu_profile *profile, char *argtype, char *argname, int value);
+void emu_profile_argument_add_short(struct emu_profile *profile, char *argtype, char *argname, int16_t value);
-void emu_profile_argument_add_string(struct emu_profile *profile, char *argtype,  char *argname, char *value);
-void emu_profile_argument_add_ptr(struct emu_profile *profile,  char *argtype,  char *argname, uint32_t value);
@@ -136 +142 @@
-void emu_profile_function_returnvalue_int_set(struct emu_profile *profile, const char *type, int value);
-void emu_profile_function_returnvalue_ptr_set(struct emu_profile *profile, const char *type, int value);
+
+
+void *emu_profile_function_argument_get(struct emu_profile_function *function, int argc);
-#endif

libemu/trunk/src/environment/emu_profile.c

@@ -37 +37 @@
-#include "emu/environment/emu_profile.h"
-
+/*
-static char *renderings[] =
-{
@@ -49 +50 @@
-        "render_array"
-};
-
+
-typedef unsigned char byte;
-
@@ -153 +154 @@
-}
-
+void emu_profile_argument_add_short(struct emu_profile *profile, char *argtype, char *argname, int16_t value)
+{
+    struct emu_profile_argument *argument = emu_profile_argument_new(render_short, argtype, argname);
+        argument->value.tshort = value;
+        emu_profile_argument_add(profile, argument);
+}
+
+
-void emu_profile_argument_add_string(struct emu_profile *profile, char *argtype, char *argname, char *value)
-{
@@ -231 +240 @@
-}
-
+uint32_t measure_size(struct emu_profile_argument *argument, bool followptr)
+{
+        uint32_t size = 0;
+        struct emu_profile_argument *argumentit;
+
+        switch(argument->render)
+        {
+        case render_struct:
+                for (argumentit = emu_profile_arguments_first(argument->value.tstruct.arguments); 
+                          !emu_profile_arguments_istail(argumentit); 
+                          argumentit = emu_profile_arguments_next(argumentit))
+                {
+                        size += measure_size(argumentit,  followptr);
+                }
+                break;
+
+        case render_array:
+
+                for (argumentit = emu_profile_arguments_first(argument->value.tstruct.arguments); 
+                          !emu_profile_arguments_istail(argumentit); 
+                          argumentit = emu_profile_arguments_next(argumentit))
+                {
+                        size += measure_size(argumentit, followptr);
+
+                }
+                break;
+
+        case render_int:
+                size += 4;
+                break;
+
+        case render_short:
+                size += 2;
+                break;
+
+        case render_string:
+                size += strlen(argument->value.tchar) +1;
+                break;
+
+        case render_ptr:
+                {
+                        size += 4;
+                        if (followptr)
+                                size += measure_size(argument->value.tptr.ptr, followptr);
+                }
+                break;
+
+        case render_ip:
+                size += 4;
+                break;
+
+        case render_port:
+                size += 2;
+                break;
+
+        case render_none:
+                size += 4;
+                break;
+        }
+
+        return size;
+}
+
+int copy_data(struct emu_profile_argument *argument, uint8_t *addr, uint8_t **next)
+{
+        printf("%s : %i \n", __PRETTY_FUNCTION__, __LINE__);
+
+        uint32_t *addr32 = (uint32_t *)addr;
+        uint16_t *addr16 = (uint16_t *)addr;
+
+        int size = measure_size(argument, false);
+        int offset = 0;
+
+        struct emu_profile_argument *argumentit;
+
+        if (addr == *next)
+        {
+                *next = addr + size;
+        }
+
+        switch(argument->render)
+        {
+        case render_struct:
+                for (argumentit = emu_profile_arguments_first(argument->value.tstruct.arguments); 
+                          !emu_profile_arguments_istail(argumentit); 
+                          argumentit = emu_profile_arguments_next(argumentit))
+                {
+//                      size += measure_size(argumentit,  false);
+                        offset += copy_data(argumentit, addr+offset, next);
+                }
+                break;
+
+        case render_array:
+
+                for (argumentit = emu_profile_arguments_first(argument->value.tstruct.arguments); 
+                          !emu_profile_arguments_istail(argumentit); 
+                          argumentit = emu_profile_arguments_next(argumentit))
+                {
+//                      size += measure_size(argumentit, level - 1);
+                        offset += copy_data(argumentit, addr+offset, next);
+                }
+                break;
+
+        case render_int:
+//              size += 4;
+                *addr32 = argument->value.tint;
+                break;
+
+        case render_short:
+                *addr16 = argument->value.tshort;
+                break;
+
+        case render_string:
+//              size += strlen(argument->value.tchar) +1;
+                strcpy((char *)addr, argument->value.tchar); 
+                break;
+
+        case render_ptr:
+                {
+//                      size += 4;
+//                      size += measure_size(argument->value.tptr.ptr, false);
+                        *addr32 = (uint32_t)*next;
+
+                        copy_data(argument->value.tptr.ptr, *next, next);
+                }
+                break;
+
+        case render_ip:
+//              size += 4;
+                *addr32 = argument->value.tint;
+                break;
+
+        case render_port:
+//              size += 2;              
+                *addr16 = (uint16_t)argument->value.tint;
+
+                break;
+
+        case render_none:
+//              size += 4;
+                break;
+        }
+
+        return size;
+}
+
+void *emu_profile_function_argument_get(struct emu_profile_function *function, int argc)
+{
+        int i = 0;
+        struct emu_profile_argument *argument = emu_profile_arguments_first(function->arguments);
+
+        while (i < argc)
+        {
+                argument = emu_profile_arguments_next(argument);
+                i++;
+
+                if (emu_profile_arguments_istail(argument))
+                        return NULL;
+        }
+
+        uint32_t size = 0;
+        size = measure_size(argument, true);
+
+        printf("%s size is %i\n", argument->argname, size);
+
+        uint8_t *data = malloc(size);
+        uint8_t *next = data;
+        memset(data, 0x90, size);
+        copy_data(argument, data, &next);
+
+        return data;
+}
+
+
-struct emu_profile_argument *emu_profile_argument_new(enum emu_profile_argument_render render, const char *type, const char *name)
-{
@@ -266 +449 @@
-        case render_none:
-        case render_int:
+        case render_short:
-                break;
-
@@ -337 +521 @@
-                printf("%s %s %s = %i;\n", indents(indent), argument->argtype, argument->argname, argument->value.tint);
-                break;
+
+        case render_short:
+                printf("%s %s %s = %i;\n", indents(indent), argument->argtype, argument->argname, argument->value.tshort);
+                break;
+
-
-        case render_string:
@@ -419 +608 @@
-int emu_profile_dump_byte_write(FILE *f, byte value)
-{
-4
+1
-                return 0;
-        return -1;
@@ -432 +621 @@
-        return -1;
-}
+
+int emu_profile_dump_short_write(FILE *f, int16_t value)
+{
+        int16_t nval = htons(value);
+
+        if (fwrite(&nval, 2, 1, f) == 2)
+                return 0;
+        return -1;
+}
+
-
-int emu_profile_dump_string_write(FILE *f, const char *string)
@@ -473 +672 @@
-                break;
-
+        case render_short:
+                emu_profile_dump_short_write(f, argument->value.tshort);
+                break;
+
+
-        case render_string:
-                emu_profile_dump_string_write(f, argument->value.tchar);
@@ -578 +782 @@
-        return -1;
-}
+
+int emu_profile_dump_short_read(FILE *f, int16_t *i)
+{
+        if (fread(i, 1, 2, f) == 2)
+        {
+                *i = ntohs(*i);
+        return 0;
+        }
+        return -1;
+}
+
+
-
-int emu_profile_dump_string_read(FILE *f, char **string)
@@ -605 +821 @@
-                return 0;
-
-
+//
-
-        switch ( render )
@@ -616 +832 @@
-                        int argcount=0;
-                        emu_profile_dump_int_read(f, &argcount);
-
+//
-                        while ( argcount > 0 )
-                        {
@@ -632 +848 @@
-                        int argcount=0;
-                        emu_profile_dump_int_read(f, &argcount);
-
+//
-                        while ( argcount > 0 )
-                        {
@@ -650 +866 @@
-                break;
-
+        case render_short:
+                {
+                        int16_t value = 0;
+                        emu_profile_dump_short_read(f,&value);
+                        emu_profile_argument_add_short(profile, argtype, argname, value);
+                }
+                break;
+
-        case render_string:
-                {
@@ -702 +926 @@
-        int argcount = 0;
-        emu_profile_dump_int_read(f, &argcount);
-
+//
-        while (argcount > 0)
-        {
@@ -726 +950 @@
-        int functions = 0;
-        emu_profile_dump_int_read(f, &functions);
-
+//
-        while (functions > 0)
-        {

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

@@ -138 +138 @@
-                emu_profile_argument_add_ptr(env->profile, "sockaddr_in *", "name", name);
-                emu_profile_argument_struct_start(env->profile, "", "");
-in
+shor
-                emu_profile_argument_add_port(env->profile, "unsigned short", "sin_port", si->sin_port);
-                emu_profile_argument_struct_start(env->profile, "in_addr", "sin_addr");
@@ -240 +240 @@
-                emu_profile_argument_add_ptr(env->profile, "sockaddr_in *", "name", name);
-                emu_profile_argument_struct_start(env->profile, "", "");
-in
+shor
-                emu_profile_argument_add_port(env->profile, "unsigned short", "sin_port", si->sin_port);
-                emu_profile_argument_struct_start(env->profile, "in_addr", "sin_addr");

libemu/trunk/testsuite/Makefile.am

@@ -4 +4 @@
-AM_LDFLAGS = -lemu -L../src 
-
-
-
+ scprofiler
+ 
-
-testsuite_LDADD = ../src/libemu.la
@@ -31 +31 @@
-memtest_SOURCES = memtest.c
-
+scprofiler_LDADD = ../src/libemu.la
+scprofiler_SOURCES = scprofiler.c
+
-EXTRA_DIST = emunids.c

libemu/trunk/testsuite/sctest.c

@@ -1514 +1514 @@
-};
-
+
-struct instr_vertex
-{
@@ -1748 +1749 @@
-                                emu_hashtable_insert(eh, (void *)eipsave, ev);
-                        }
-
-                        if ( last_vertex != NULL )
-                        {
-                                struct emu_edge *ee = emu_vertex_edge_add(last_vertex, ev);
-                                struct emu_cpu *cpu = emu_cpu_get(e);
-                                if ( cpu->instr.is_fpu == 0 && cpu->instr.source.cond_pos == eipsave && cpu->instr.source.has_cond_pos == 1 )
-                                        ee->data = (void *)0x1;
-                        }
-
-                        last_vertex = ev;
-                }
-
@@ -1764 +1755 @@
-                if ( dllhook != NULL )
-                {
-
+
+
-                        {
+                                if ( ev->data != NULL && strcmp(dllhook->fnname, "CreateProcessA") == 0)
+                                {
+                                        ev = emu_vertex_new();
+                                        emu_graph_vertex_add(graph, ev);
+                                }
+
+//                              fnname_from_profile(env->profile, dllhook->fnname);
-                                iv = instr_vertex_new(eipsave,dllhook->fnname);
-                                emu_vertex_data_set(ev, iv);
@@ -1865 +1864 @@
-                        }
-                }
+                if ( opts.graphfile != NULL )
+                {
+                        if ( last_vertex != NULL )
+                        {
+                                struct emu_edge *ee = emu_vertex_edge_add(last_vertex, ev);
+                                struct emu_cpu *cpu = emu_cpu_get(e);
+                                if ( cpu->instr.is_fpu == 0 && cpu->instr.source.cond_pos == eipsave && cpu->instr.source.has_cond_pos == 1 )
+                                        ee->data = (void *)0x1;
+                        }
+
+                        last_vertex = ev;
+                }
-
-//                      printf("\n");
@@ -1923 +1934 @@
-                nev->data = niv;
-
-->eip
+
-                ev->color = white;
-        }
@@ -1956 +1967 @@
-
-                // create the new vertex 
-->eip
+
-                niv = (struct instr_vertex *)nev->data;
-
@@ -1986 +1997 @@
-                {
-                        struct instr_vertex *ivto = emu_vertex_data_get(ee->destination);
-->eip
+
-                        struct emu_vertex *to = (struct emu_vertex *)ehi->value;
-                        if ( 1 )// nev != to )//&& to->color != black )
@@ -2042 +2053 @@
-#endif // 0
-                if ( iv->dll != NULL || iv->syscall != NULL )
-iv->eip
+(unsigned int)iv
-                else
-iv->eip
+(unsigned int)iv
-        }
-
@@ -2058 +2069 @@
-
-                        if ( ee->data != (void *)0x0 )
-ivfrom->eip, ivto->eip
+(unsigned int)ivfrom, (unsigned int)ivto
-                        else
-ivfrom->eip, ivto->eip
+(unsigned int)ivfrom, (unsigned int)ivto
-
-                        if ( ee->count > 100 )
@@ -2095 +2106 @@
-}
-
-
-
-
-
+
+
+
-        struct emu *e = emu_new();
-
-==
+>
-        {
-                emu_log_level_set(emu_logging_get(e),EMU_LOG_DEBUG);
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        emu_free(e);
+
-        return 0;
-}
-
+
-
-void dump(int n)
@@ -2210 +2196 @@
-}
-
-
-
+
-{
-        unsigned buffer[BUFSIZ];
@@ -2262 +2247 @@
-        opts.size = len;
-
-
+
+
+
+
+
+
-        /* set the registers to the initial values */
-        struct emu_cpu *cpu = emu_cpu_get(e);
@@ -2281 +2271 @@
-        int static_offset = CODE_OFFSET;
-        emu_memory_write_block(mem, static_offset, opts.scode,  opts.size);
-
+
-
-
@@ -2290 +2280 @@
-
-        free(opts.scode);
+
-        return 0;
-
-}
+
+int prepare_from_stdin(struct emu *e)
+{
+        if (opts.size != 0)
+                prepare_from_stdin_read();
+
+        prepare_from_stdin_write(e);
+
+
+        return 0;
+
+}
+
-
-
@@ -2329 +2332 @@
-                /* set eip to the code */
-                emu_cpu_eip_set(emu_cpu_get(e), static_offset + opts.offset);
+
+                opts.scode = (unsigned char *) tests[i].code;
+                opts.size = tests[i].codesize;
-                return 0;
-        }
@@ -2519 +2525 @@
-        struct emu *e = emu_new();
-        if ( prepare(e) == 0 )
+        {
+                if (opts.getpc == 1)
+                {
+                        getpctest();
+
+                        emu_free(e);
+                        e = emu_new();
+                        prepare(e);
+                }
+
-                test(e);
-
+}
-
-        emu_free(e);