July 2020 - Wine-Commits - list.winehq.org

Matteo Bruni : wined3d: Update reported NVIDIA driver version for Fermi+ GPUs.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 6d229621016ed58b2ceebdf915ce971f936bdc9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d229621016ed58b2ceebdf9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 14 14:10:35 2020 +0200 wined3d: Update reported NVIDIA driver version for Fermi+ GPUs. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 186 +++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 2 + 2 files changed, 96 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6d229621016ed58b2cee…

1 0

Myah Caron : ntdll/tests: Add test to check if GetTickCount is updated after sleeping.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 4617f83fcf0a34fe41b0e38dde1567195395efca URL: https://source.winehq.org/git/wine.git/?a=commit;h=4617f83fcf0a34fe41b0e38d… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Mon Jul 13 17:08:38 2020 +0000 ntdll/tests: Add test to check if GetTickCount is updated after sleeping. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49564 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index d756a8c839..a00d507e4e 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -199,7 +199,7 @@ static void test_user_shared_data_time(void) { KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; ULONGLONG t1, t2, t3; - int i = 0; + int i = 0, changed = 0; i = 0; do @@ -253,6 +253,15 @@ static void test_user_shared_data_time(void) "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); } + + for (i = 0; i < 100; i++) + { + t1 = GetTickCount(); + Sleep(1); + t2 = GetTickCount(); + if (t1 != t2) changed++; + } + todo_wine ok(changed >= 90, "tick count isn't updated after sleeping one millisecond (%d%% correct)\n", changed); } START_TEST(time)

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_FILL_OUTPUT in FillConsoleOutputCharacterW.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: bf6a803e04db1c466c9e7b1fd44e17ee10b17381 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf6a803e04db1c466c9e7b1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 14 16:23:22 2020 +0200 kernelbase: Use IOCTL_CONDRV_FILL_OUTPUT in FillConsoleOutputCharacterW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 1df084fab9..4468d713d9 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -446,7 +446,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH FillConsoleOutputCharacterA( HANDLE handle, CHAR c BOOL WINAPI DECLSPEC_HOTPATCH FillConsoleOutputCharacterW( HANDLE handle, WCHAR ch, DWORD length, COORD coord, DWORD *written ) { - BOOL ret; + struct condrv_fill_output_params params; TRACE( "(%p,%s,%d,(%dx%d),%p)\n", handle, debugstr_wn(&ch, 1), length, coord.X, coord.Y, written ); @@ -457,19 +457,16 @@ BOOL WINAPI DECLSPEC_HOTPATCH FillConsoleOutputCharacterW( HANDLE handle, WCHAR } *written = 0; - SERVER_START_REQ( fill_console_output ) - { - req->handle = console_handle_unmap( handle ); - req->x = coord.X; - req->y = coord.Y; - req->mode = CHAR_INFO_MODE_TEXT; - req->wrap = TRUE; - req->data.ch = ch; - req->count = length; - if ((ret = !wine_server_call_err( req ))) *written = reply->written; - } - SERVER_END_REQ; - return ret; + + params.mode = CHAR_INFO_MODE_TEXT; + params.x = coord.X; + params.y = coord.Y; + params.count = length; + params.wrap = TRUE; + params.ch = ch; + params.attr = 0; + return console_ioctl( handle, IOCTL_CONDRV_FILL_OUTPUT, &params, sizeof(params), + written, sizeof(written), NULL ); } HANDLE get_console_wait_handle( HANDLE handle )

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_FILL_OUTPUT ioctl.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 6b96e0e0cbdc28e9dbde3fa3d9bc948b512fd1fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b96e0e0cbdc28e9dbde3fa3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 14 16:23:17 2020 +0200 server: Introduce IOCTL_CONDRV_FILL_OUTPUT ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 13 +++++++++++++ server/console.c | 20 ++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 25e5820046..a8b7c04915 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -36,6 +36,7 @@ /* console output ioctls */ #define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_PROPERTIES) #define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) +#define IOCTL_CONDRV_FILL_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 35, METHOD_BUFFERED, FILE_WRITE_DATA) /* console renderer ioctls */ #define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_PROPERTIES) @@ -80,6 +81,18 @@ struct condrv_output_info_params struct condrv_output_info info; /* output info */ }; +/* IOCTL_CONDRV_FILL_OUTPUT params */ +struct condrv_fill_output_params +{ + int x; /* position where to start writing */ + int y; + int mode; /* char info mode */ + int count; /* number to write */ + int wrap; /* wrap around at end of line? */ + WCHAR ch; /* character to write */ + unsigned short attr; /* attribute to write */ +}; + #define SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM 0x0001 #define SET_CONSOLE_OUTPUT_INFO_CURSOR_POS 0x0002 #define SET_CONSOLE_OUTPUT_INFO_SIZE 0x0004 diff --git a/server/console.c b/server/console.c index 72e98f14a9..a5ddd82478 100644 --- a/server/console.c +++ b/server/console.c @@ -1682,6 +1682,26 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * return set_output_info( screen_buffer, params, get_req_data_size() - sizeof(*params) ); } + case IOCTL_CONDRV_FILL_OUTPUT: + { + const struct condrv_fill_output_params *params = get_req_data(); + char_info_t data; + DWORD written; + if (get_req_data_size() != sizeof(*params) || + (get_reply_max_size() && get_reply_max_size() != sizeof(written))) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + data.ch = params->ch; + data.attr = params->attr; + written = fill_console_output( screen_buffer, data, params->mode, + params->x, params->y, params->count, params->wrap ); + if (written && get_reply_max_size() == sizeof(written)) + set_reply_data( &written, sizeof(written) ); + return !get_error(); + } + default: set_error( STATUS_INVALID_HANDLE ); return 0;

1 0

Piotr Caban : ucrtbase: Add parameters validation to _timespec32_get function.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 2a12ccd8e8a0e72d544205e22c91e749ddb74129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a12ccd8e8a0e72d544205e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:22:40 2020 +0200 ucrtbase: Add parameters validation to _timespec32_get function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 7f565e350d..f7bb452a43 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1998,6 +1998,9 @@ int CDECL _timespec32_get(struct _timespec32 *ts, int base) { struct _timespec64 ts64; + if(!MSVCRT_CHECK_PMT(ts != NULL)) return 0; + if(base != TIME_UTC) return 0; + if(_timespec64_get(&ts64, base) != base) return 0; if(ts64.tv_sec != (MSVCRT___time32_t)ts64.tv_sec)

1 0

Matteo Bruni : wined3d: Fix / update reported driver model version.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: a76475909d362abc8c6ec31588fedcdf0e9c7dbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a76475909d362abc8c6ec315… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 14 14:10:32 2020 +0200 wined3d: Fix / update reported driver model version. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 454125c146..45f3f61f2f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -198,20 +198,26 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) return refcount; } -/* Certain applications (Steam) complain if we report an outdated driver version. In general, - * reporting a driver version is moot because we are not the Windows driver, and we have different - * bugs, features, etc. +/* Certain applications (e.g. Steam) complain if we report an outdated driver + * version. * * The driver version has the form "x.y.z.w". * - * "x" is the Windows version the driver is meant for: + * "x" is the Windows version / driver model the driver is meant for: * 4 -> 95/98/NT4 * 5 -> 2000 - * 6 -> 2000/XP - * 7 -> Vista - * 8 -> Windows 7 - * 9 -> Windows 8 - * 10 -> Windows 10 + * 6 -> XP + * 7 -> Vista - WDDM 1.0 + * 8 -> Windows 7 - WDDM 1.1 + * 9 -> Windows 8 - WDDM 1.2 + * 10 -> Windows 8.1 - WDDM 1.3 + * 20 -> Windows 10 - WDDM 2.0 + * 21 -> Windows 10 Anniversary Update - WDDM 2.1 + * 22 -> Windows 10 Creators Update - WDDM 2.2 + * 23 -> Windows 10 Fall Creators Update - WDDM 2.3 + * 24 -> Windows 10 April 2018 Update - WDDM 2.4 + * 25 -> Windows 10 October 2018 Update - WDDM 2.5 + * 26 -> Windows 10 May 2019 Update - WDDM 2.6 * * "y" is the maximum Direct3D version the driver supports. * y -> d3d version mapping: @@ -705,20 +711,25 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, driver_os_version = 8; driver_model = DRIVER_MODEL_NT6X; } + else if (os_version.dwMinorVersion == 2) + { + driver_os_version = 9; + driver_model = DRIVER_MODEL_NT6X; + } else { if (os_version.dwMinorVersion > 3) { - FIXME("Unhandled OS version %u.%u, reporting Win 8.\n", + FIXME("Unhandled OS version %u.%u, reporting Windows 8.1.\n", os_version.dwMajorVersion, os_version.dwMinorVersion); } - driver_os_version = 9; + driver_os_version = 10; driver_model = DRIVER_MODEL_NT6X; } break; case 10: - driver_os_version = 10; + driver_os_version = 26; driver_model = DRIVER_MODEL_NT6X; break;

1 0

Piotr Caban : ntdll: Ignore L length specifier in printf.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: a6fb7be678438ab689ac87ad4ed21a9b33a17c2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6fb7be678438ab689ac87ad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 15:33:24 2020 +0200 ntdll: Ignore L length specifier in printf. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/printf.h | 6 +++++- dlls/ntdll/tests/string.c | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/printf.h b/dlls/ntdll/printf.h index febb9e7bf7..9f7bad767f 100644 --- a/dlls/ntdll/printf.h +++ b/dlls/ntdll/printf.h @@ -375,11 +375,15 @@ static int FUNC_NAME(pf_vsnprintf)( FUNC_NAME(pf_output) *out, const APICHAR *fo flags.IntegerDouble = TRUE; p += 2; } - else if( *p == 'l' || *p == 'L' ) + else if( *p == 'l' ) { flags.IntegerLength = LEN_LONG; p++; } + else if( *p == 'L' ) + { + p++; + } else if( *p == 'h') { flags.IntegerLength = LEN_SHORT; diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index cade4e4533..b6a40f6709 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1529,6 +1529,14 @@ static void test__snprintf(void) ok(!memcmp(buffer, "tes", 3), "buf = %s\n", buffer); ok(buffer[3] == 0x7c, "buffer[3] = %x\n", buffer[3]); + res = p_snprintf(buffer, sizeof(buffer), "%ls", L"test"); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "test"), "got %s\n", debugstr_a(buffer)); + + res = p_snprintf(buffer, sizeof(buffer), "%Ls", "test"); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "test"), "got %s\n", debugstr_a(buffer)); + res = p_snprintf(buffer, sizeof(buffer), "%I64x %d", (ULONGLONG)0x1234567890, 1); ok(res == strlen(buffer), "wrong size %d\n", res); ok(!strcmp(buffer, "1234567890 1"), "got %s\n", debugstr_a(buffer));

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_FILL_OUTPUT in FillConsoleOutputAttribute.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 440e31a73212382362cf64982de8ecf2d579cdb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=440e31a73212382362cf6498… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 14 16:23:28 2020 +0200 kernelbase: Use IOCTL_CONDRV_FILL_OUTPUT in FillConsoleOutputAttribute. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 4468d713d9..49259857af 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -400,7 +400,7 @@ DWORD WINAPI CtrlRoutine( void *arg ) BOOL WINAPI DECLSPEC_HOTPATCH FillConsoleOutputAttribute( HANDLE handle, WORD attr, DWORD length, COORD coord, DWORD *written ) { - BOOL ret; + struct condrv_fill_output_params params; TRACE( "(%p,%d,%d,(%dx%d),%p)\n", handle, attr, length, coord.X, coord.Y, written ); @@ -411,19 +411,16 @@ BOOL WINAPI DECLSPEC_HOTPATCH FillConsoleOutputAttribute( HANDLE handle, WORD at } *written = 0; - SERVER_START_REQ( fill_console_output ) - { - req->handle = console_handle_unmap( handle ); - req->x = coord.X; - req->y = coord.Y; - req->mode = CHAR_INFO_MODE_ATTR; - req->wrap = TRUE; - req->data.attr = attr; - req->count = length; - if ((ret = !wine_server_call_err( req ))) *written = reply->written; - } - SERVER_END_REQ; - return ret; + + params.mode = CHAR_INFO_MODE_ATTR; + params.x = coord.X; + params.y = coord.Y; + params.count = length; + params.wrap = TRUE; + params.ch = 0; + params.attr = attr; + return console_ioctl( handle, IOCTL_CONDRV_FILL_OUTPUT, &params, sizeof(params), + written, sizeof(written), NULL ); }

1 0

Matteo Bruni : wined3d: Update reported AMD RX driver version.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 4a274314ffdf2e8730bcfc0b697af22bc6173fe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a274314ffdf2e8730bcfc0b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 14 14:10:34 2020 +0200 wined3d: Update reported AMD RX driver version. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dff8219270..53fdf3168b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -265,7 +265,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 10, 1280}, {DRIVER_AMD_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 10, 741 }, {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 10, 1280}, - {DRIVER_AMD_RX, DRIVER_MODEL_NT6X, "aticfx32.dll", 10, 1474}, + {DRIVER_AMD_RX, DRIVER_MODEL_NT6X, "aticfx32.dll", 15002, 61}, /* Intel * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp

1 0

Paul Gofman : ntdll: Always align stack pointer in __wine_syscall_dispatcher on x64.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: e9b3660e729929f4e09f403d526759d532df03e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9b3660e729929f4e09f403d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jul 14 19:06:36 2020 +0300 ntdll: Always align stack pointer in __wine_syscall_dispatcher on x64. Syscall thunks break stack alignment for dispatcher. Regardless of that, it is probably better not to assume aligned stack in syscall thunk entry. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 97191ca89e..278de20522 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1497,23 +1497,25 @@ void output_syscalls( DLLSPEC *spec ) * depends on us returning to it. Adjust the return address accordingly. */ output( "\tsubq $0xb,0x8(%%rbp)\n" ); output( "\tcmpq $%u,%%rax\n", count ); - output( "\tjae 3f\n" ); + output( "\tjae 4f\n" ); output( "\tleaq .Lsyscall_args(%%rip),%%rcx\n" ); output( "\tmovzbl (%%rcx,%%rax),%%ecx\n" ); output( "\tsubq $0x20,%%rcx\n" ); - output( "\tjbe 1f\n" ); - output( "\tsubq %%rcx,%%rsp\n" ); + output( "\tja 1f\n" ); + output( "\tandq $~15,%%rsp\n\t" ); + output( "\tjmp 2f\n" ); + output( "1:\tsubq %%rcx,%%rsp\n" ); output( "\tshrq $3,%%rcx\n" ); output( "\tleaq 0x38(%%rbp),%%rsi\n" ); output( "\tandq $~15,%%rsp\n\t" ); output( "\tmovq %%rsp,%%rdi\n" ); output( "\tcld\n" ); output( "\trep; movsq\n" ); - output( "1:\tmovq %%r10,%%rcx\n" ); + output( "2:\tmovq %%r10,%%rcx\n" ); output( "\tsubq $0x20,%%rsp\n" ); output( "\tleaq .Lsyscall_table(%%rip),%%r10\n" ); output( "\tcallq *(%%r10,%%rax,8)\n" ); - output( "2:\tleaq -0x10(%%rbp),%%rsp\n" ); + output( "3:\tleaq -0x10(%%rbp),%%rsp\n" ); output( "\tpopq %%rdi\n" ); output_cfi( ".cfi_same_value %%rdi" ); output( "\tpopq %%rsi\n" ); @@ -1523,8 +1525,8 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_adjust_cfa_offset -8" ); output_cfi( ".cfi_same_value %%rbp" ); output( "\tret\n" ); - output( "3:\tmovl $0x%x,%%eax\n", invalid_param ); - output( "\tjmp 2b\n" ); + output( "4:\tmovl $0x%x,%%eax\n", invalid_param ); + output( "\tjmp 3b\n" ); break; case CPU_ARM: output( "\tldr r1, 4f\n" );

1 0