September 2010 - Wine-Commits

Thomas Mullaly : urlmon: IUriBuilder_CreateUri* functions return base IUri if there were no changes .
by Alexandre Julliard Sept. 20, 2010

Sept. 20, 2010

Module: wine Branch: master Commit: 947e4ec56737cffc9ad322afa728b159aa41288a URL: http://source.winehq.org/git/wine.git/?a=commit;h=947e4ec56737cffc9ad322afa… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Sep 17 16:54:39 2010 -0400 urlmon: IUriBuilder_CreateUri* functions return base IUri if there were no changes. --- dlls/urlmon/tests/uri.c | 182 +++++++++++++++++++++++++++++++++++------------ dlls/urlmon/uri.c | 126 ++++++++++++++++++++++----------- 2 files changed, 222 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=947e4ec56737cffc9ad32…

1 0

Thomas Mullaly : urlmon: Restructured how the userinfo component is parsed and canonicalized.
by Alexandre Julliard Sept. 20, 2010

Sept. 20, 2010

Module: wine Branch: master Commit: fcc9d609b008230cdee7129e620df24cf408f446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc9d609b008230cdee7129e6… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Sep 12 19:11:10 2010 -0400 urlmon: Restructured how the userinfo component is parsed and canonicalized. --- dlls/urlmon/uri.c | 244 +++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 182 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fcc9d609b008230cdee71…

1 0

Thomas Mullaly : urlmon: Implemented validation for the userinfo component when create an IUri with IUriBuilder .
by Alexandre Julliard Sept. 20, 2010

Sept. 20, 2010

Module: wine Branch: master Commit: e48b81036aa36e91458e68745608de48650e8b8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48b81036aa36e91458e68745… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Sep 18 17:10:33 2010 -0400 urlmon: Implemented validation for the userinfo component when create an IUri with IUriBuilder. --- dlls/urlmon/tests/uri.c | 84 ++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 108 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 185 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 617486f..3bbb578 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5124,6 +5124,90 @@ static const uri_builder_test uri_builder_tests[] = { 0,INET_E_INVALID_URL,FALSE, 0,INET_E_INVALID_URL,FALSE, 0,0,0,INET_E_INVALID_URL,FALSE + }, + /* UserName can't contain any character that is a delimeter for another + * component that appears after it in a normal URI. + */ + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"user:pass",NULL,Uri_PROPERTY_USER_NAME,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"user(a)google.com",NULL,Uri_PROPERTY_USER_NAME,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"user/path",NULL,Uri_PROPERTY_USER_NAME,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"user?Query",NULL,Uri_PROPERTY_USER_NAME,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"user#Frag",NULL,Uri_PROPERTY_USER_NAME,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"pass(a)google.com",NULL,Uri_PROPERTY_PASSWORD,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"pass/path",NULL,Uri_PROPERTY_PASSWORD,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"pass?query",NULL,Uri_PROPERTY_PASSWORD,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"pass#frag",NULL,Uri_PROPERTY_PASSWORD,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index f46cbfb..eaf8c83 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -26,7 +26,9 @@ #define UINT_MAX 0xffffffff #define USHORT_MAX 0xffff -#define ALLOW_NULL_TERM_SCHEME 0x1 +#define ALLOW_NULL_TERM_SCHEME 0x1 +#define ALLOW_NULL_TERM_USER_NAME 0x2 +#define ALLOW_NULL_TERM_PASSWORD 0x4 WINE_DEFAULT_DEBUG_CHANNEL(urlmon); @@ -1281,7 +1283,7 @@ static BOOL parse_scheme(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD return TRUE; } -static BOOL parse_username(const WCHAR **ptr, parse_data *data, DWORD flags) { +static BOOL parse_username(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD extras) { data->username = *ptr; while(**ptr != ':' && **ptr != '@') { @@ -1294,7 +1296,9 @@ static BOOL parse_username(const WCHAR **ptr, parse_data *data, DWORD flags) { } } else continue; - } else if(is_auth_delim(**ptr, data->scheme_type != URL_SCHEME_UNKNOWN)) { + } else if(extras & ALLOW_NULL_TERM_USER_NAME && !**ptr) + break; + else if(is_auth_delim(**ptr, data->scheme_type != URL_SCHEME_UNKNOWN)) { *ptr = data->username; data->username = NULL; return FALSE; @@ -1307,7 +1311,7 @@ static BOOL parse_username(const WCHAR **ptr, parse_data *data, DWORD flags) { return TRUE; } -static BOOL parse_password(const WCHAR **ptr, parse_data *data, DWORD flags) { +static BOOL parse_password(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD extras) { const WCHAR *start = *ptr; if(**ptr != ':') @@ -1326,7 +1330,9 @@ static BOOL parse_password(const WCHAR **ptr, parse_data *data, DWORD flags) { } } else continue; - } else if(is_auth_delim(**ptr, data->scheme_type != URL_SCHEME_UNKNOWN)) { + } else if(extras & ALLOW_NULL_TERM_PASSWORD && !**ptr) + break; + else if(is_auth_delim(**ptr, data->scheme_type != URL_SCHEME_UNKNOWN)) { *ptr = start; data->password = NULL; return FALSE; @@ -1361,12 +1367,12 @@ static BOOL parse_password(const WCHAR **ptr, parse_data *data, DWORD flags) { static void parse_userinfo(const WCHAR **ptr, parse_data *data, DWORD flags) { const WCHAR *start = *ptr; - if(!parse_username(ptr, data, flags)) { + if(!parse_username(ptr, data, flags, 0)) { TRACE("(%p %p %x): URI contained no userinfo.\n", ptr, data, flags); return; } - if(!parse_password(ptr, data, flags)) { + if(!parse_password(ptr, data, flags, 0)) { *ptr = start; data->username = NULL; data->username_len = 0; @@ -3561,6 +3567,90 @@ static HRESULT validate_scheme_name(const UriBuilder *builder, parse_data *data, return S_OK; } +static HRESULT validate_username(const UriBuilder *builder, parse_data *data, DWORD flags) { + const WCHAR *ptr; + const WCHAR **pptr; + DWORD expected_len; + + if(builder->username) { + ptr = builder->username; + expected_len = builder->username_len; + } else if(!(builder->modified_props & Uri_HAS_USER_NAME) && builder->uri && + builder->uri->userinfo_start > -1 && builder->uri->userinfo_split != 0) { + /* Just use the username from the base Uri. */ + data->username = builder->uri->canon_uri+builder->uri->userinfo_start; + data->username_len = (builder->uri->userinfo_split > -1) ? + builder->uri->userinfo_split : builder->uri->userinfo_len; + ptr = NULL; + } else { + ptr = NULL; + expected_len = 0; + } + + if(ptr) { + pptr = &ptr; + if(parse_username(pptr, data, flags, ALLOW_NULL_TERM_USER_NAME) && + data->username_len == expected_len) + TRACE("(%p %p %x): Found valid username component %s.\n", builder, data, flags, + debugstr_wn(data->username, data->username_len)); + else { + TRACE("(%p %p %x): Invalid username component found %s.\n", builder, data, flags, + debugstr_wn(ptr, expected_len)); + return INET_E_INVALID_URL; + } + } + + return S_OK; +} + +static HRESULT validate_password(const UriBuilder *builder, parse_data *data, DWORD flags) { + const WCHAR *ptr; + const WCHAR **pptr; + DWORD expected_len; + + if(builder->password) { + ptr = builder->password; + expected_len = builder->password_len; + } else if(!(builder->modified_props & Uri_HAS_PASSWORD) && builder->uri && + builder->uri->userinfo_split > -1) { + data->password = builder->uri->canon_uri+builder->uri->userinfo_start+builder->uri->userinfo_split+1; + data->password_len = builder->uri->userinfo_len-builder->uri->userinfo_split-1; + ptr = NULL; + } else { + ptr = NULL; + expected_len = 0; + } + + if(ptr) { + pptr = &ptr; + if(parse_password(pptr, data, flags, ALLOW_NULL_TERM_PASSWORD) && + data->password_len == expected_len) + TRACE("(%p %p %x): Found valid password component %s.\n", builder, data, flags, + debugstr_wn(data->password, data->password_len)); + else { + TRACE("(%p %p %x): Invalid password component found %s.\n", builder, data, flags, + debugstr_wn(ptr, expected_len)); + return INET_E_INVALID_URL; + } + } + + return S_OK; +} + +static HRESULT validate_userinfo(const UriBuilder *builder, parse_data *data, DWORD flags) { + HRESULT hr; + + hr = validate_username(builder, data, flags); + if(FAILED(hr)) + return hr; + + hr = validate_password(builder, data, flags); + if(FAILED(hr)) + return hr; + + return S_OK; +} + static HRESULT validate_components(const UriBuilder *builder, parse_data *data, DWORD flags) { HRESULT hr; @@ -3582,6 +3672,10 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, } } + hr = validate_userinfo(builder, data, flags); + if(FAILED(hr)) + return hr; + return E_NOTIMPL; }

1 0

André Hentschel : winebuild: Fix ARM support.
by Alexandre Julliard Sept. 20, 2010

Sept. 20, 2010

Module: wine Branch: master Commit: bbfc0d1d64d0c4477bb7b5f5893785277de90290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfc0d1d64d0c4477bb7b5f58… Author: André Hentschel <webmaster(a)dawncrow.de> Date: Sat Sep 18 18:01:16 2010 +0200 winebuild: Fix ARM support. --- tools/winebuild/import.c | 30 ++++++++++++++++++++++++------ tools/winebuild/spec32.c | 2 -- tools/winebuild/utils.c | 2 +- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 6a77a3f..1b89352 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -676,8 +676,10 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "\tjmp $31,($0)\n" ); break; case CPU_ARM: - output( "\tmov r4, #%s\n", table ); - output( "\tldr r15, [r4, #%d]\n", pos ); + output( "\tldr IP,[PC,#0]\n"); + output( "\tmov PC,PC\n"); + output( "\t%s %s\n", get_asm_ptr_keyword(), table ); + output( "\tldr PC,[IP,#%d]\n", pos); break; case CPU_POWERPC: output( "\tmr %s, %s\n", ppc_reg(0), ppc_reg(31) ); @@ -992,9 +994,15 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tjmp $31,($0)\n" ); break; case CPU_ARM: - output( "\tstmfd sp!, {r4, r5, r6, r7, r8, r9, r10, lr}\n" ); - output( "\tblx %s\n", asm_name("__wine_spec_delay_load") ); - output( "\tldmfd sp!, {r4, r5, r6, r7, r8, r9, r10, pc}\n" ); + output( "\tstmfd SP!, {r4-r10,FP,LR}\n" ); + output( "\tmov LR,PC\n"); + output( "\tadd LR,LR,#8\n"); + output( "\tldr PC,[PC,#-4]\n"); + output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name("__wine_spec_delay_load") ); + output( "\tmov IP,r0\n"); + output( "\tldmfd SP!, {r4-r10,FP,LR}\n" ); + output( "\tldmfd SP!, {r0-r3}\n" ); + output( "\tbx IP\n"); break; case CPU_POWERPC: if (target_platform == PLATFORM_APPLE) extra_stack_storage = 56; @@ -1080,7 +1088,17 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tjmp $31,%s\n", asm_name("__wine_delay_load_asm") ); break; case CPU_ARM: - output( "\tb %s\n", asm_name("__wine_delay_load_asm") ); + output( "\tstmfd SP!, {r0-r3}\n" ); + output( "\tmov r0, #%d\n", idx ); + output( "\tmov r1, #16384\n" ); + output( "\tmul r1, r0, r1\n" ); + output( "\tmov r0, r1\n" ); + output( "\tmov r1, #4\n" ); + output( "\tmul r1, r0, r1\n" ); + output( "\tmov r0, r1\n" ); + output( "\tadd r0, #%d\n", j ); + output( "\tldr PC,[PC,#-4]\n"); + output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name("__wine_delay_load_asm") ); break; case CPU_POWERPC: switch(target_platform) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 030a6bc..29436f1 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -396,8 +396,6 @@ static void output_asm_constructor( const char *constructor ) output( "\tjsr $26,%s\n", asm_name(constructor) ); break; case CPU_ARM: - output( "\tblx %s\n", asm_name(constructor) ); - break; case CPU_POWERPC: output( "\tbl %s\n", asm_name(constructor) ); break; diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index d5902c6..1dbb6d6 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -840,11 +840,11 @@ unsigned int get_alignment(unsigned int align) case CPU_x86: case CPU_x86_64: case CPU_SPARC: - case CPU_ARM: if (target_platform != PLATFORM_APPLE) return align; /* fall through */ case CPU_POWERPC: case CPU_ALPHA: + case CPU_ARM: n = 0; while ((1u << n) != align) n++; return n;

1 0

André Hentschel : winedbg: Add ARM support.
by Alexandre Julliard Sept. 20, 2010

Sept. 20, 2010

Module: wine Branch: master Commit: 09e6a4143518c4c55d74b4d5798bb606efa4b7c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09e6a4143518c4c55d74b4d57… Author: André Hentschel <webmaster(a)dawncrow.de> Date: Sat Sep 18 18:02:38 2010 +0200 winedbg: Add ARM support. --- programs/winedbg/Makefile.in | 1 + programs/winedbg/be_arm.c | 189 ++++++++++++++++++++++++++++++++++++++++++ programs/winedbg/gdbproxy.c | 16 ++++ programs/winedbg/winedbg.c | 4 + 4 files changed, 210 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 0f21926..a669721 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -7,6 +7,7 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS C_SRCS = \ be_alpha.c \ + be_arm.c \ be_i386.c \ be_ppc.c \ be_sparc.c \ diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c new file mode 100644 index 0000000..f81f14d --- /dev/null +++ b/programs/winedbg/be_arm.c @@ -0,0 +1,189 @@ +/* + * Debugger ARM specific functions + * + * Copyright 2000-2003 Marcus Meissner + * 2004 Eric Pouech + * 2010 André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "debugger.h" + +#if defined(__arm__) + +static unsigned be_arm_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum be_cpu_addr bca, ADDRESS64* addr) +{ + switch (bca) + { + case be_cpu_addr_pc: + return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->Pc); + case be_cpu_addr_stack: + return be_cpu_build_addr(hThread, ctx, addr, 0, ctx->Sp); + default: + case be_cpu_addr_frame: + dbg_printf("not done\n"); + } + return FALSE; +} + +static unsigned be_arm_get_register_info(int regno, enum be_cpu_addr* kind) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static void be_arm_single_step(CONTEXT* ctx, unsigned enable) +{ + dbg_printf("not done\n"); +} + +static void be_arm_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs) +{ + dbg_printf("Context printing for arm not done yet\n"); +} + +static void be_arm_print_segment_info(HANDLE hThread, const CONTEXT* ctx) +{ +} + +static struct dbg_internal_var be_arm_ctx[] = +{ + {0, NULL, 0, dbg_itype_none} +}; + +static unsigned be_arm_is_step_over_insn(const void* insn) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static unsigned be_arm_is_function_return(const void* insn) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static unsigned be_arm_is_break_insn(const void* insn) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static unsigned be_arm_is_func_call(const void* insn, ADDRESS64* callee) +{ + return FALSE; +} + +static void be_arm_disasm_one_insn(ADDRESS64* addr, int display) +{ + dbg_printf("Disasm NIY\n"); +} + +static unsigned be_arm_insert_Xpoint(HANDLE hProcess, const struct be_process_io* pio, + CONTEXT* ctx, enum be_xpoint_type type, + void* addr, unsigned long* val, unsigned size) +{ + SIZE_T sz; + + switch (type) + { + case be_xpoint_break: + if (!size) return 0; + if (!pio->read(hProcess, addr, val, 4, &sz) || sz != 4) return 0; + default: + dbg_printf("Unknown/unsupported bp type %c\n", type); + return 0; + } + return 1; +} + +static unsigned be_arm_remove_Xpoint(HANDLE hProcess, const struct be_process_io* pio, + CONTEXT* ctx, enum be_xpoint_type type, + void* addr, unsigned long val, unsigned size) +{ + SIZE_T sz; + + switch (type) + { + case be_xpoint_break: + if (!size) return 0; + if (!pio->write(hProcess, addr, &val, 4, &sz) || sz == 4) return 0; + break; + default: + dbg_printf("Unknown/unsupported bp type %c\n", type); + return 0; + } + return 1; +} + +static unsigned be_arm_is_watchpoint_set(const CONTEXT* ctx, unsigned idx) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static void be_arm_clear_watchpoint(CONTEXT* ctx, unsigned idx) +{ + dbg_printf("not done\n"); +} + +static int be_arm_adjust_pc_for_break(CONTEXT* ctx, BOOL way) +{ + dbg_printf("not done\n"); + return 0; +} + +static int be_arm_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, + unsigned ext_sign, LONGLONG* ret) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static int be_arm_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, + long double* ret) +{ + dbg_printf("not done\n"); + return FALSE; +} + +struct backend_cpu be_arm = +{ + IMAGE_FILE_MACHINE_ARM, + 4, + be_cpu_linearize, + be_cpu_build_addr, + be_arm_get_addr, + be_arm_get_register_info, + be_arm_single_step, + be_arm_print_context, + be_arm_print_segment_info, + be_arm_ctx, + be_arm_is_step_over_insn, + be_arm_is_function_return, + be_arm_is_break_insn, + be_arm_is_func_call, + be_arm_disasm_one_insn, + be_arm_insert_Xpoint, + be_arm_remove_Xpoint, + be_arm_is_watchpoint_set, + be_arm_clear_watchpoint, + be_arm_adjust_pc_for_break, + be_arm_fetch_integer, + be_arm_fetch_float, +}; +#endif diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index bb2cdbe..3c86950 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -426,6 +426,22 @@ static size_t cpu_register_map[] = { FIELD_OFFSET(CONTEXT, i6), FIELD_OFFSET(CONTEXT, i7), }; +#elif defined(__arm__) +static size_t cpu_register_map[] = { + FIELD_OFFSET(CONTEXT, R0), + FIELD_OFFSET(CONTEXT, R1), + FIELD_OFFSET(CONTEXT, R2), + FIELD_OFFSET(CONTEXT, R3), + FIELD_OFFSET(CONTEXT, R4), + FIELD_OFFSET(CONTEXT, R5), + FIELD_OFFSET(CONTEXT, R6), + FIELD_OFFSET(CONTEXT, R7), + FIELD_OFFSET(CONTEXT, R8), + FIELD_OFFSET(CONTEXT, R9), + FIELD_OFFSET(CONTEXT, R10), + FIELD_OFFSET(CONTEXT, Fp), + FIELD_OFFSET(CONTEXT, Ip), +}; #else # error Define the registers map for your CPU #endif diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index aeef795..a649123 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -614,6 +614,8 @@ extern struct backend_cpu be_alpha; extern struct backend_cpu be_x86_64; #elif defined(__sparc__) extern struct backend_cpu be_sparc; +#elif defined(__arm__) +extern struct backend_cpu be_arm; #else # error CPU unknown #endif @@ -634,6 +636,8 @@ int main(int argc, char** argv) be_cpu = &be_x86_64; #elif defined(__sparc__) be_cpu = &be_sparc; +#elif defined(__arm__) + be_cpu = &be_arm; #else # error CPU unknown #endif

1 0

André Hentschel : dbghelp: Add ARM support.
by Alexandre Julliard Sept. 20, 2010

Sept. 20, 2010

Module: wine Branch: master Commit: 9a1103112e633b301b927e99fec70b7b475c968e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a1103112e633b301b927e99f… Author: André Hentschel <webmaster(a)dawncrow.de> Date: Sat Sep 18 18:02:28 2010 +0200 dbghelp: Add ARM support. --- dlls/dbghelp/Makefile.in | 1 + dlls/dbghelp/cpu_arm.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/dbghelp.c | 6 ++- 3 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index 95ed2af..7c4f73a 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -6,6 +6,7 @@ DELAYIMPORTS = version C_SRCS = \ coff.c \ + cpu_arm.c \ cpu_i386.c \ cpu_ppc.c \ cpu_sparc.c \ diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c new file mode 100644 index 0000000..0bd8aad --- /dev/null +++ b/dlls/dbghelp/cpu_arm.c @@ -0,0 +1,79 @@ +/* + * File cpu_arm.c + * + * Copyright (C) 2009-2009, Eric Pouech + * Copyright (C) 2010, André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "dbghelp_private.h" +#include "winternl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); + +static unsigned arm_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) +{ + switch (ca) + { + case cpu_addr_pc: + case cpu_addr_stack: + case cpu_addr_frame: + default: + FIXME("not done for ARM\n"); + } + return FALSE; +} + +static BOOL arm_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CONTEXT* context) +{ + FIXME("not done for ARM\n"); + return FALSE; +} + +static unsigned arm_map_dwarf_register(unsigned regno) +{ + FIXME("not done for ARM\n"); + return 0; +} + +static void* arm_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size) +{ + FIXME("not done for ARM\n"); + return NULL; +} + +static const char* arm_fetch_regname(unsigned regno) +{ + FIXME("Unknown register %x\n", regno); + return NULL; +} + +struct cpu cpu_arm = { + IMAGE_FILE_MACHINE_ARM, + 4, + arm_get_addr, + arm_stack_walk, + NULL, + arm_map_dwarf_register, + arm_fetch_context_reg, + arm_fetch_regname, +}; diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index fe7d892..bd4a9cb 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -151,9 +151,9 @@ const char* wine_dbgstr_addr(const ADDRESS64* addr) } } -extern struct cpu cpu_i386, cpu_x86_64, cpu_ppc, cpu_sparc; +extern struct cpu cpu_i386, cpu_x86_64, cpu_ppc, cpu_sparc, cpu_arm; -static struct cpu* dbghelp_cpus[] = {&cpu_i386, &cpu_x86_64, &cpu_ppc, &cpu_sparc, NULL}; +static struct cpu* dbghelp_cpus[] = {&cpu_i386, &cpu_x86_64, &cpu_ppc, &cpu_sparc, &cpu_arm, NULL}; struct cpu* dbghelp_current_cpu = #if defined(__i386__) &cpu_i386 @@ -163,6 +163,8 @@ struct cpu* dbghelp_current_cpu = &cpu_ppc #elif defined(__sparc__) &cpu_sparc +#elif defined(__arm__) + &cpu_arm #else #error define support for your CPU #endif

1 0

André Hentschel : kernel32: Add ARM support.
by Alexandre Julliard Sept. 20, 2010

Sept. 20, 2010

Module: wine Branch: master Commit: ee3a6770b8875259d9efc0c523e3eb8da9e81587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee3a6770b8875259d9efc0c52… Author: André Hentschel <webmaster(a)dawncrow.de> Date: Sat Sep 18 18:01:59 2010 +0200 kernel32: Add ARM support. --- dlls/kernel32/tests/file.c | 2 ++ dlls/kernel32/tests/loader.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 033e53e..375b5f0 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1729,6 +1729,8 @@ static BOOL create_fake_dll( LPCSTR filename ) nt->FileHeader.Machine = IMAGE_FILE_MACHINE_POWERPC; #elif defined __sparc__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_SPARC; +#elif defined __arm__ + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARM; #else # error You must specify the machine type #endif diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 5da70c8..ddfdba7 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -56,6 +56,8 @@ static IMAGE_NT_HEADERS nt_header = IMAGE_FILE_MACHINE_POWERPC, /* Machine */ #elif defined __sparc__ IMAGE_FILE_MACHINE_SPARC, /* Machine */ +#elif defined __arm__ + IMAGE_FILE_MACHINE_ARM, /* Machine */ #else # error You must specify the machine type #endif

1 0

André Hentschel : ntdll: Add ARM support.
by Alexandre Julliard Sept. 20, 2010

Sept. 20, 2010

Module: wine Branch: master Commit: 171c9a532750566d3c786b4d7c1ab807a1265b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=171c9a532750566d3c786b4d7… Author: André Hentschel <webmaster(a)dawncrow.de> Date: Sat Sep 18 18:02:12 2010 +0200 ntdll: Add ARM support. --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/nt.c | 2 + dlls/ntdll/server.c | 2 + dlls/ntdll/signal_arm.c | 800 +++++++++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 7 +- 5 files changed, 809 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=171c9a532750566d3c786…

1 0

André Hentschel : libs/wine: Fix ARM support.
by Alexandre Julliard Sept. 20, 2010

Sept. 20, 2010

Module: wine Branch: master Commit: c704758a2f144c23ee215d52be715ce52551a44f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c704758a2f144c23ee215d52b… Author: André Hentschel <webmaster(a)dawncrow.de> Date: Sat Sep 18 18:01:06 2010 +0200 libs/wine: Fix ARM support. --- libs/wine/port.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index f4ad2e9..7cbe5b4 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -171,20 +171,16 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack, "lwz 0, 4(1)\n\t" /* fetch return address */ "mtlr 0\n\t" /* return address -> lr */ "blr") /* return */ -#elif defined(__arm__) +#elif defined(__arm__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_call_on_stack, - "str r14, [r13, #4]\n\t" /* save return address on stack */ - "sub r2, r2, #16\n\t" /* reserve space on new stack */ - "str r13, [r2, #12]\n\t" /* store old sp */ - "mov r3, r0\n\t" /* func */ - "mov r0, r1\n\t" /* arg */ - "mov r13, r2\n\t" /* stack */ - "mov r2, #0\n\t" /* zero */ - "str r2, [r13]\n\t" /* bottom of stack */ - "sub r13, r13, #16\n\t" /* create a frame for this function */ - "blx r3\n\t" /* call func */ - "ldr r13, [r13, #28]\n\t" /* fetch old sp */ - "ldr r15, [r13, #4]") /* fetch return address and return */ + "push {r4,LR}\n\t" /* save return address on stack */ + "mov r4, sp\n\t" /* store old sp in local var */ + "mov sp, r2\n\t" /* stack */ + "mov r2, r0\n\t" /* func -> scratch register */ + "mov r0, r1\n\t" /* arg */ + "blx r2\n\t" /* call func */ + "mov sp, r4\n\t" /* restore old sp from local var */ + "pop {r4,PC}") /* fetch return address into pc */ #else #error You must implement wine_switch_to_stack for your platform #endif

1 0

André Hentschel : server: Add ARM support.
by Alexandre Julliard Sept. 20, 2010

Sept. 20, 2010

Module: wine Branch: master Commit: ccaeb3ed834f99e5c818c7d3da47abba8d632de8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccaeb3ed834f99e5c818c7d3d… Author: André Hentschel <webmaster(a)dawncrow.de> Date: Sat Sep 18 18:03:56 2010 +0200 server: Add ARM support. --- include/wine/server_protocol.h | 6 ++++-- server/protocol.def | 4 +++- server/thread.c | 6 ++++++ server/trace.c | 8 ++++++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index b699956..4c5bc6e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -129,7 +129,7 @@ typedef union enum cpu_type { - CPU_x86, CPU_x86_64, CPU_ALPHA, CPU_POWERPC, CPU_SPARC + CPU_x86, CPU_x86_64, CPU_ALPHA, CPU_POWERPC, CPU_ARM, CPU_SPARC }; typedef int cpu_type_t; @@ -146,6 +146,7 @@ typedef struct struct { unsigned __int64 fir; unsigned int psr, __pad; } alpha_regs; struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs; + struct { unsigned int sp, lr, pc, cpsr; } arm_regs; struct { unsigned int psr, pc, npc, y, wim, tbr; } sparc_regs; } ctl; union @@ -156,6 +157,7 @@ typedef struct struct { unsigned __int64 v0, t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, s0, s1, s2, s3, s4, s5, s6, a0, a1, a2, a3, a4, a5, at; } alpha_regs; struct { unsigned int gpr[32], cr, xer; } powerpc_regs; + struct { unsigned int r[13]; } arm_regs; struct { unsigned int g[8], o[8], l[8], i[8]; } sparc_regs; } integer; union @@ -5515,6 +5517,6 @@ union generic_reply struct set_cursor_reply set_cursor_reply; }; -#define SERVER_PROTOCOL_VERSION 408 +#define SERVER_PROTOCOL_VERSION 409 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index e3e078d..660981f 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -145,7 +145,7 @@ typedef union /* supported CPU types */ enum cpu_type { - CPU_x86, CPU_x86_64, CPU_ALPHA, CPU_POWERPC, CPU_SPARC + CPU_x86, CPU_x86_64, CPU_ALPHA, CPU_POWERPC, CPU_ARM, CPU_SPARC }; typedef int cpu_type_t; @@ -162,6 +162,7 @@ typedef struct struct { unsigned __int64 fir; unsigned int psr, __pad; } alpha_regs; struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs; + struct { unsigned int sp, lr, pc, cpsr; } arm_regs; struct { unsigned int psr, pc, npc, y, wim, tbr; } sparc_regs; } ctl; /* selected by SERVER_CTX_CONTROL */ union @@ -172,6 +173,7 @@ typedef struct struct { unsigned __int64 v0, t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, s0, s1, s2, s3, s4, s5, s6, a0, a1, a2, a3, a4, a5, at; } alpha_regs; struct { unsigned int gpr[32], cr, xer; } powerpc_regs; + struct { unsigned int r[13]; } arm_regs; struct { unsigned int g[8], o[8], l[8], i[8]; } sparc_regs; } integer; /* selected by SERVER_CTX_INTEGER */ union diff --git a/server/thread.c b/server/thread.c index a1d2d4b..05e4121 100644 --- a/server/thread.c +++ b/server/thread.c @@ -63,6 +63,8 @@ static const unsigned int supported_cpus = CPU_FLAG(CPU_ALPHA); static const unsigned int supported_cpus = CPU_FLAG(CPU_POWERPC); #elif defined(__sparc__) static const unsigned int supported_cpus = CPU_FLAG(CPU_SPARC); +#elif defined(__arm__) +static const unsigned int supported_cpus = CPU_FLAG(CPU_ARM); #else #error Unsupported CPU #endif @@ -1000,6 +1002,7 @@ static unsigned int get_context_system_regs( enum cpu_type cpu ) case CPU_x86_64: return SERVER_CTX_DEBUG_REGISTERS; case CPU_ALPHA: return 0; case CPU_POWERPC: return 0; + case CPU_ARM: return 0; case CPU_SPARC: return 0; } return 0; @@ -1033,6 +1036,9 @@ void break_thread( struct thread *thread ) case CPU_SPARC: data.exception.address = thread->context->ctl.sparc_regs.pc; break; + case CPU_ARM: + data.exception.address = thread->context->ctl.arm_regs.pc; + break; } generate_debug_event( thread, EXCEPTION_DEBUG_EVENT, &data ); thread->debug_break = 0; diff --git a/server/trace.c b/server/trace.c index 6f0e01e..1d8233b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -569,6 +569,14 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) fprintf( stderr, ",fpscr=%g", ctx.fp.powerpc_regs.fpscr ); } break; + case CPU_ARM: + if (ctx.flags & SERVER_CTX_CONTROL) + fprintf( stderr, ",sp=%08x,lr=%08x,pc=%08x,cpsr=%08x", + ctx.ctl.arm_regs.sp, ctx.ctl.arm_regs.lr, + ctx.ctl.arm_regs.pc, ctx.ctl.arm_regs.cpsr ); + if (ctx.flags & SERVER_CTX_INTEGER) + for (i = 0; i < 13; i++) fprintf( stderr, ",r%u=%08x", i, ctx.integer.arm_regs.r[i] ); + break; case CPU_SPARC: if (ctx.flags & SERVER_CTX_CONTROL) fprintf( stderr, ",psr=%08x,pc=%08x,npc=%08x,y=%08x,wim=%08x,tbr=%08x",

1 0