Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 46837: [ISAPNP] - Comment it out from the bootloader. - Remove it from machine.inf. - This "driver" introduces significant delay at every boot due to i/o space scanning every time at every boot, however there is no real benefit (it always fails). Inclusion of this driver into default boot process might be reconsidered only after it starts providing some advantages. For now please test this driver in your own working copies.
by fireball＠svn.reactos.org 11 Apr '10

11 Apr '10

Author: fireball Date: Sun Apr 11 14:18:27 2010 New Revision: 46837 URL: http://svn.reactos.org/svn/reactos?rev=46837&view=rev Log: [ISAPNP] - Comment it out from the bootloader. - Remove it from machine.inf. - This "driver" introduces significant delay at every boot due to i/o space scanning every time at every boot, however there is no real benefit (it always fails). Inclusion of this driver into default boot process might be reconsidered only after it starts providing some advantages. For now please test this driver in your own working copies. Modified: trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/media/inf/machine.inf Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sun Apr 11 14:18:27 2010 @@ -37,10 +37,10 @@ ext2.sys=,,,,,,x,,,,,,4 [HardwareIdsDatabase] -*PNP0A00 = isapnp +;*PNP0A00 = isapnp *PNP0A03 = pci *PNP0C08 = acpi -PCI\CC_0601 = isapnp +;PCI\CC_0601 = isapnp PCI\CC_0604 = pci [BootBusExtenders.Load] Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… ============================================================================== Binary files - no diff available.

1 0

[gschneider] 46836: [WIN32K] - Handle keyboard input when no windows are present - Patch by Andrey Ivanov with changes suggested in the bug report See issue #3560 for more details.
by gschneider＠svn.reactos.org 11 Apr '10

11 Apr '10

Author: gschneider Date: Sun Apr 11 12:39:20 2010 New Revision: 46836 URL: http://svn.reactos.org/svn/reactos?rev=46836&view=rev Log: [WIN32K] - Handle keyboard input when no windows are present - Patch by Andrey Ivanov with changes suggested in the bug report See issue #3560 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sun Apr 11 12:39:20 2010 @@ -713,6 +713,7 @@ for (;NumKeys;memcpy(&KeyInput, &NextKeyInput, sizeof(KeyInput)), NumKeys--) { + PKBL keyboardLayout = NULL; lParam = 0; IntKeyboardUpdateLeds(KeyboardDeviceHandle, @@ -783,29 +784,30 @@ } /* Find the target thread whose locale is in effect */ - FocusQueue = IntGetFocusMessageQueue(); - - /* This might cause us to lose hot keys, which are important - * (ctrl-alt-del secure attention sequence). Not sure if it - * can happen though. - */ - if (!FocusQueue) - continue; + FocusQueue = IntGetFocusMessageQueue(); + + if (FocusQueue) + { + msg.hwnd = FocusQueue->FocusWindow; + + FocusThread = FocusQueue->Thread; + if (FocusThread && FocusThread->Tcb.Win32Thread) + { + keyboardLayout = ((PTHREADINFO)FocusThread->Tcb.Win32Thread)->KeyboardLayout; + } + } + if (!keyboardLayout) + { + keyboardLayout = W32kGetDefaultKeyLayout(); + } msg.lParam = lParam; - msg.hwnd = FocusQueue->FocusWindow; - - FocusThread = FocusQueue->Thread; - - if (!(FocusThread && FocusThread->Tcb.Win32Thread && - ((PTHREADINFO)FocusThread->Tcb.Win32Thread)->KeyboardLayout)) - continue; /* This function uses lParam to fill wParam according to the * keyboard layout in use. */ W32kKeyProcessMessage(&msg, - ((PTHREADINFO)FocusThread->Tcb.Win32Thread)->KeyboardLayout->KBTables, + keyboardLayout->KBTables, KeyInput.Flags & KEY_E0 ? 0xE0 : (KeyInput.Flags & KEY_E1 ? 0xE1 : 0)); @@ -827,6 +829,11 @@ continue; /* Eat key up motion too */ } + if (!FocusQueue) + { + /* There is no focused window to receive a keyboard message */ + continue; + } /* * Post a keyboard message. */

1 0

[tkreuzer] 46835: Undefine WIN32, only _WIN32 should be defined
by tkreuzer＠svn.reactos.org 11 Apr '10

11 Apr '10

Author: tkreuzer Date: Sun Apr 11 03:50:07 2010 New Revision: 46835 URL: http://svn.reactos.org/svn/reactos?rev=46835&view=rev Log: Undefine WIN32, only _WIN32 should be defined Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Sun Apr 11 03:50:07 2010 @@ -34,6 +34,7 @@   <compilerflag>-U_X86_</compilerflag> + <compilerflag>-UWIN32</compilerflag> <compilerflag>-Wno-format</compilerflag> <compilerflag>-fno-leading-underscore</compilerflag> </group>

1 0

[tkreuzer] 46834: [CDROM] - ULONG -> ULONG_PTR
by tkreuzer＠svn.reactos.org 11 Apr '10

11 Apr '10

Author: tkreuzer Date: Sun Apr 11 03:40:15 2010 New Revision: 46834 URL: http://svn.reactos.org/svn/reactos?rev=46834&view=rev Log: [CDROM] - ULONG -> ULONG_PTR Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] Sun Apr 11 03:40:15 2010 @@ -5127,7 +5127,7 @@ // The data buffer must be aligned. // - srb->DataBuffer = (PVOID) (((ULONG) (context + 1) + (alignment - 1)) & + srb->DataBuffer = (PVOID) (((ULONG_PTR) (context + 1) + (alignment - 1)) & ~(alignment - 1)); @@ -5877,7 +5877,7 @@ irpStack = IoGetCurrentIrpStackLocation(irp); if (irpStack->Parameters.Others.Argument3) { - ULONG count; + ULONG_PTR count; // // Decrement the countdown timer and put the IRP back in the list. @@ -6497,7 +6497,7 @@ PIO_STACK_LOCATION irpStack; NTSTATUS status; BOOLEAN retry; - ULONG retryCount; + ULONG_PTR retryCount; ULONG lastSector; PIRP originalIrp; PCDROM_DATA cddata;

1 0

[tkreuzer] 46833: Reduce diff to trunk
by tkreuzer＠svn.reactos.org 11 Apr '10

11 Apr '10

Author: tkreuzer Date: Sun Apr 11 03:37:27 2010 New Revision: 46833 URL: http://svn.reactos.org/svn/reactos?rev=46833&view=rev Log: Reduce diff to trunk Modified: branches/ros-amd64-bringup/reactos/drivers/ksfilter/ks/event.c Modified: branches/ros-amd64-bringup/reactos/drivers/ksfilter/ks/event.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/ksfilter/ks/event.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/ksfilter/ks/event.c [iso-8859-1] Sun Apr 11 03:37:27 2010 @@ -526,7 +526,7 @@ { /* release object */ ObDereferenceObject(EventEntry->Object); -} + } /* free event entry */ ExFreePool(EventEntry); @@ -608,7 +608,7 @@ { /* signal event */ KeSetEvent(EntryEvent->Object, EntryEvent->Reserved, FALSE); -} + } else if (EntryEvent->NotificationType == KSEVENTF_SEMAPHORE_HANDLE || EntryEvent->NotificationType == KSEVENTF_SEMAPHORE_OBJECT) { /* release semaphore */

1 0

[tkreuzer] 46832: [ACPICA] - revert hacks to gcc specific header - Hack acwin64.h, don't assume msvc for win64
by tkreuzer＠svn.reactos.org 11 Apr '10

11 Apr '10

Author: tkreuzer Date: Sun Apr 11 03:35:16 2010 New Revision: 46832 URL: http://svn.reactos.org/svn/reactos?rev=46832&view=rev Log: [ACPICA] - revert hacks to gcc specific header - Hack acwin64.h, don't assume msvc for win64 Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpica/include/platform/acwin64.h Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h [iso-8859-1] Sun Apr 11 03:35:16 2010 @@ -134,33 +134,6 @@ */ #define ACPI_UNUSED_VAR __attribute__ ((unused)) -#if defined (_AMD64_) - -#define COMPILER_DEPENDENT_INT64 long long int -#define COMPILER_DEPENDENT_UINT64 unsigned long long int - -// FIXME: These are only sonly stubs to make it compile - -#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \ - do { \ - int dummy; \ - asm("1: movl (%1),%%eax;" \ - "movl %%eax,%%edx;" \ - :"=a"(Acq),"=c"(dummy):"c"(GLptr),"i"(~1L):"dx"); \ - } while(0) - -#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) \ - do { \ - int dummy; \ - asm("1: movl (%1),%%eax;" \ - "movl %%eax,%%edx;" \ - :"=a"(Acq),"=c"(dummy):"c"(GLptr),"i"(~3L):"dx"); \ - } while(0) - -/*! [End] no source code translation !*/ - -#else /* DO IA32 */ - #define COMPILER_DEPENDENT_INT64 long long int #define COMPILER_DEPENDENT_UINT64 unsigned long long int @@ -191,9 +164,6 @@ :"=a"(Acq),"=c"(dummy):"c"(GLptr),"i"(~3L):"dx"); \ } while(0) -#endif /* IA 32 */ - - #define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \ { \ q32 = n_hi / d32; \ Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpica/include/platform/acwin64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpica/include/platform/acwin64.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpica/include/platform/acwin64.h [iso-8859-1] Sun Apr 11 03:35:16 2010 @@ -118,10 +118,14 @@ /*! [Begin] no source code translation (Keep the include) */ -#include "acintel.h" +//#include "acintel.h" +// HACK +#define INT32 _ACPI_INT32 +#define UINT32 _ACPI_UINT32 + /*! [End] no source code translation !*/ -#define ACPI_MACHINE_WIDTH 64 +#define ACPI_MACHINE_WIDTH 64 #define ACPI_USE_STANDARD_HEADERS

1 0

[sserapion] 46831: revert accidental changes.
by sserapion＠svn.reactos.org 10 Apr '10

10 Apr '10

Author: sserapion Date: Sun Apr 11 01:28:58 2010 New Revision: 46831 URL: http://svn.reactos.org/svn/reactos?rev=46831&view=rev Log: revert accidental changes. Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Sun Apr 11 01:28:58 2010 @@ -16,7 +16,6 @@ <file>sysbus.c</file> </directory> <file>beep.c</file> - <file>bios.c</file> <file>cmos.c</file> <file>display.c</file> <file>dma.c</file> @@ -29,6 +28,7 @@ <file>timer.c</file> <file>usage.c</file> <if property="ARCH" value="i386"> + <file>bios.c</file> <directory name="i386"> <file>portio.c</file> <file>systimer.S</file> @@ -36,9 +36,16 @@ </directory> </if> <if property="ARCH" value="amd64"> + <define name="_X86BIOS_" /> + <include base="x86emu">.</include> <directory name="amd64"> <file>x86bios.c</file> + <file>halinit.c</file> + <file>irq.S</file> + <file>misc.c</file> + <file>apic.c</file> <file>systimer.S</file> + <file>usage.c</file> </directory> </if> </directory>

1 0

[sserapion] 46830: Remove redundant implementations of setjmp/longjmp now present in libcntpr.
by sserapion＠svn.reactos.org 10 Apr '10

10 Apr '10

Author: sserapion Date: Sun Apr 11 01:07:26 2010 New Revision: 46830 URL: http://svn.reactos.org/svn/reactos?rev=46830&view=rev Log: Remove redundant implementations of setjmp/longjmp now present in libcntpr. Removed: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/setjmp.S branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/i386/longjmp.S branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/i386/setjmp.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/i386/i386-dis.c branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild Removed: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/setjmp.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/setjmp.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/setjmp.S (removed) @@ -1,118 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of _setjmp/longjmp - * FILE: lib/sdk/crt/setjmp/amd64/setjmp.s - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> - -.intel_syntax noprefix - -#define JUMP_BUFFER_Frame 0x00 -#define JUMP_BUFFER_Rbx 0x08 -#define JUMP_BUFFER_Rsp 0x10 -#define JUMP_BUFFER_Rbp 0x18 -#define JUMP_BUFFER_Rsi 0x20 -#define JUMP_BUFFER_Rdi 0x28 -#define JUMP_BUFFER_R12 0x30 -#define JUMP_BUFFER_R13 0x38 -#define JUMP_BUFFER_R14 0x40 -#define JUMP_BUFFER_R15 0x48 -#define JUMP_BUFFER_Rip 0x50 -#define JUMP_BUFFER_Spare 0x58 -#define JUMP_BUFFER_Xmm6 0x60 -#define JUMP_BUFFER_Xmm7 0x70 -#define JUMP_BUFFER_Xmm8 0x80 -#define JUMP_BUFFER_Xmm9 0x90 -#define JUMP_BUFFER_Xmm10 0xa0 -#define JUMP_BUFFER_Xmm11 0xb0 -#define JUMP_BUFFER_Xmm12 0xc0 -#define JUMP_BUFFER_Xmm13 0xd0 -#define JUMP_BUFFER_Xmm14 0xe0 -#define JUMP_BUFFER_Xmm15 0xf0 - - -/* FUNCTIONS ******************************************************************/ - -/* - * int _setjmp(jmp_buf env); - * - * Parameters: <rcx> - jmp_buf env - * Returns: 0 - * Notes: Sets up the jmp_buf - */ -.globl _setjmp -_setjmp: - /* Load rsp as it was before the call into rax */ - lea rax, [rsp + 8] - /* Load return address into r8 */ - mov r8, [rsp] - mov qword ptr [rcx + JUMP_BUFFER_Frame], 0 - mov [rcx + JUMP_BUFFER_Rbx], rbx - mov [rcx + JUMP_BUFFER_Rbp], rbp - mov [rcx + JUMP_BUFFER_Rsi], rsi - mov [rcx + JUMP_BUFFER_Rdi], rdi - mov [rcx + JUMP_BUFFER_R12], r12 - mov [rcx + JUMP_BUFFER_R13], r13 - mov [rcx + JUMP_BUFFER_R14], r14 - mov [rcx + JUMP_BUFFER_R15], r15 - mov [rcx + JUMP_BUFFER_Rsp], rax - mov [rcx + JUMP_BUFFER_Rip], r8 - movdqa [rcx + JUMP_BUFFER_Xmm6], xmm6 - movdqa [rcx + JUMP_BUFFER_Xmm7], xmm7 - movdqa [rcx + JUMP_BUFFER_Xmm8], xmm8 - movdqa [rcx + JUMP_BUFFER_Xmm9], xmm9 - movdqa [rcx + JUMP_BUFFER_Xmm10], xmm10 - movdqa [rcx + JUMP_BUFFER_Xmm11], xmm11 - movdqa [rcx + JUMP_BUFFER_Xmm12], xmm12 - movdqa [rcx + JUMP_BUFFER_Xmm13], xmm13 - movdqa [rcx + JUMP_BUFFER_Xmm14], xmm14 - movdqa [rcx + JUMP_BUFFER_Xmm15], xmm15 - xor rax, rax - ret - -/* - * void longjmp(jmp_buf env, int value); - * - * Parameters: <rcx> - jmp_buf setup by _setjmp - * <rdx> - int value to return - * Returns: Doesn't return - * Notes: Non-local goto - */ -.proc longjmp - - // FIXME: handle frame - - mov rbx, [rcx + JUMP_BUFFER_Rbx] - mov rbp, [rcx + JUMP_BUFFER_Rbp] - mov rsi, [rcx + JUMP_BUFFER_Rsi] - mov rdi, [rcx + JUMP_BUFFER_Rdi] - mov r12, [rcx + JUMP_BUFFER_R12] - mov r13, [rcx + JUMP_BUFFER_R13] - mov r14, [rcx + JUMP_BUFFER_R14] - mov r15, [rcx + JUMP_BUFFER_R15] - mov rsp, [rcx + JUMP_BUFFER_Rsp] - mov r8, [rcx + JUMP_BUFFER_Rip] - movdqa xmm6, [rcx + JUMP_BUFFER_Xmm6] - movdqa xmm7, [rcx + JUMP_BUFFER_Xmm7] - movdqa xmm8, [rcx + JUMP_BUFFER_Xmm8] - movdqa xmm9, [rcx + JUMP_BUFFER_Xmm9] - movdqa xmm10, [rcx + JUMP_BUFFER_Xmm10] - movdqa xmm11, [rcx + JUMP_BUFFER_Xmm11] - movdqa xmm12, [rcx + JUMP_BUFFER_Xmm12] - movdqa xmm13, [rcx + JUMP_BUFFER_Xmm13] - movdqa xmm14, [rcx + JUMP_BUFFER_Xmm14] - movdqa xmm15, [rcx + JUMP_BUFFER_Xmm15] - - /* return param2 or 1 if it was 0 */ - mov rax, rdx - test rax, rax - jnz 2f - inc rax -2: jmp r8 -.endproc Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/i386/i386-dis.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/i386/i386-dis.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/i386/i386-dis.c [iso-8859-1] Sun Apr 11 01:07:26 2010 @@ -37,7 +37,7 @@ #define ATTRIBUTE_UNUSED extern int sprintf(char *str, const char *format, ...); #define sprintf_vma(BUF, VMA) sprintf(BUF, "0x%X", VMA) -#define _setjmp setjmp +#include <setjmp.h> #define _INC_SETJMPEX struct disassemble_info; Removed: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/i386/longjmp.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/i386/longjmp.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/i386/longjmp.S (removed) @@ -1,70 +1,0 @@ - .file "longjmp.S" -/* - * Copyright (C) 1998, 1999, Jonathan S. Shapiro. - * - * This file is part of the EROS Operating System. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2, - * or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - - /* - * typedef struct { - * unsigned long ebx, esi, edi; - * unsigned long ebp; - * unsigned long sp; - * unsigned long pc; - * } jmp_buf[1]; - */ - - /* - * On entry, the stack to longjmp looks like: - * - * value - * ptr to jmp_buf - * return PC - */ - -.globl _longjmp -_longjmp: - pushl %ebp - movl %esp,%ebp - - movl 8(%ebp),%ecx /* address of jmp_buf to ecx */ - movl 12(%ebp),%eax /* return value to %eax */ - testl %eax,%eax - jne 1f - incl %eax /* return 1 if handed 0 */ - -1: - movl (%ecx),%ebx /* restore %ebx */ - movl 4(%ecx),%esi /* restore %esi */ - movl 8(%ecx),%edi /* restore %edi */ - - /* - * From this instant on we are not running in a valid frame - */ - - movl 12(%ecx),%ebp /* restore %ebp */ - movl 16(%ecx),%esp /* restore %esp */ - /* movl 20(%ecx),%eax return PC */ - - /* - * Since we are abandoning the stack in any case, - * there isn't much point in doing the usual return - * discipline. - */ - - jmpl *20(%ecx) - Removed: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/i386/setjmp.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/i386/setjmp.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/i386/setjmp.S (removed) @@ -1,61 +1,0 @@ - .file "setjmp.S" -/* - * Copyright (C) 1998, 1999, Jonathan S. Shapiro. - * - * This file is part of the EROS Operating System. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -/* #include <eros/i486/asm.h> */ - - - /* - * typedef struct { - * unsigned long ebx, esi, edi; - * unsigned long ebp; - * unsigned long sp; - * unsigned long pc; - * } jmp_buf[1]; - */ - - /* - * On entry, the stack to setjmp looks like: - * - * ptr to jmp_buf - * return PC - */ -.globl _setjmp -.globl __setjmp -_setjmp: -__setjmp: - pushl %ebp - movl %esp,%ebp - - movl 0x8(%ebp),%eax /* address of jmp_buf to eax */ - movl %ebx,(%eax) /* save %ebx */ - movl %esi,4(%eax) /* save %esi */ - movl %edi,8(%eax) /* save %edi */ - leal 8(%ebp),%edx /* calling proc's esp, not ours! */ - movl %edx,16(%eax) - movl 4(%ebp), %edx /* save return PC */ - movl %edx,20(%eax) - movl 0(%ebp),%edx /* calling proc's ebp, not ours! */ - movl %edx,12(%eax) - - xorl %eax,%eax /* return 0 the first time */ - leave - ret - Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Apr 11 01:07:26 2010 @@ -319,8 +319,6 @@ <group> <file>i386-dis.c</file> <file>kdb_help.S</file> - <file>longjmp.S</file> - <file>setjmp.S</file> </group> </if> </directory> @@ -332,7 +330,6 @@ <file>i386-dis.c</file> <file>kdb_help.S</file> <file>kdb.c</file> - <file>setjmp.S</file> </group> </if> </directory>

1 0

[sserapion] 46829: Remove mini_hal from build.
by sserapion＠svn.reactos.org 10 Apr '10

10 Apr '10

Author: sserapion Date: Sun Apr 11 01:06:33 2010 New Revision: 46829 URL: http://svn.reactos.org/svn/reactos?rev=46829&view=rev Log: Remove mini_hal from build. Added: branches/ros-amd64-bringup/reactos/hal/halx86/hal_mini.rbuild (with props) Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr.rbuild branches/ros-amd64-bringup/reactos/hal/hal.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] Sun Apr 11 01:06:33 2010 @@ -11,7 +11,9 @@ <library>cmlib</library> <library>rtl</library> <library>libcntpr</library> +<if property="ARCH" value="i386"> <library>mini_hal</library> +</if> <group linkerset="ld"> <linkerflag>-nostartfiles</linkerflag> <linkerflag>-nostdlib</linkerflag> Modified: branches/ros-amd64-bringup/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/hal.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/hal.rbuild [iso-8859-1] Sun Apr 11 01:06:33 2010 @@ -3,9 +3,10 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <if property="ARCH" value="i386"> - <directory name="halx86"> - <xi:include href="halx86/directory.rbuild" /> - </directory> + <directory name="halx86"> + <xi:include href="halx86/hal_mini.rbuild" /> + <xi:include href="halx86/directory.rbuild" /> + </directory> </if> <if property="ARCH" value="amd64"> Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Sun Apr 11 01:06:33 2010 @@ -16,6 +16,7 @@ <file>sysbus.c</file> </directory> <file>beep.c</file> + <file>bios.c</file> <file>cmos.c</file> <file>display.c</file> <file>dma.c</file> @@ -28,7 +29,6 @@ <file>timer.c</file> <file>usage.c</file> <if property="ARCH" value="i386"> - <file>bios.c</file> <directory name="i386"> <file>portio.c</file> <file>systimer.S</file> @@ -36,16 +36,9 @@ </directory> </if> <if property="ARCH" value="amd64"> - <define name="_X86BIOS_" /> - <include base="x86emu">.</include> <directory name="amd64"> <file>x86bios.c</file> - <file>halinit.c</file> - <file>irq.S</file> - <file>misc.c</file> - <file>apic.c</file> <file>systimer.S</file> - <file>usage.c</file> </directory> </if> </directory> @@ -53,57 +46,4 @@ <pch>hal.h</pch> </directory> </module> - - <module name="mini_hal" type="objectlibrary" crt="static"> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_NTHALDLL_" /> - <define name="_NTHAL_" /> - <define name="_BLDR_" /> - <define name="_MINIHAL_" /> - <directory name="generic"> - <directory name="bus"> - <file>bushndlr.c</file> - <file>isabus.c</file> - <file>halbus.c</file> - <file>pcibus.c</file> - <file>pcidata.c</file> - <file>sysbus.c</file> - </directory> - <file>beep.c</file> - <file>cmos.c</file> - <file>dma.c</file> - <file>display.c</file> - <file>drive.c</file> - <file>misc.c</file> - <file>profil.c</file> - <file>reboot.c</file> - <file>spinlock.c</file> - <file>sysinfo.c</file> - <file>timer.c</file> - <file>usage.c</file> - <if property="ARCH" value="i386"> - <file>bios.c</file> - <directory name="i386"> - <file>portio.c</file> - <file>systimer.S</file> - </directory> - </if> - <if property="ARCH" value="amd64"> - <directory name="amd64"> - <file>halinit.c</file> - <file>irq.S</file> - <file>misc.c</file> - <file>apic.c</file> - <file>systimer.S</file> - <file>usage.c</file> - </directory> - </if> - </directory> - <directory name="up"> - <file>halinit_up.c</file> - <file>pic.c</file> - <file>processor.c</file> - </directory> - </module> </group> Added: branches/ros-amd64-bringup/reactos/hal/halx86/hal_mini.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_mini.rbuild (added) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_mini.rbuild [iso-8859-1] Sun Apr 11 01:06:33 2010 @@ -1,0 +1,46 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group> + <module name="mini_hal" type="objectlibrary" crt="static"> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_NTHALDLL_" /> + <define name="_NTHAL_" /> + <define name="_BLDR_" /> + <define name="_MINIHAL_" /> + <directory name="generic"> + <directory name="bus"> + <file>bushndlr.c</file> + <file>isabus.c</file> + <file>halbus.c</file> + <file>pcibus.c</file> + <file>pcidata.c</file> + <file>sysbus.c</file> + </directory> + <file>beep.c</file> + <file>bios.c</file> + <file>cmos.c</file> + <file>dma.c</file> + <file>display.c</file> + <file>drive.c</file> + <file>misc.c</file> + <file>profil.c</file> + <file>reboot.c</file> + <file>spinlock.c</file> + <file>sysinfo.c</file> + <file>timer.c</file> + <file>usage.c</file> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>portio.c</file> + <file>systimer.S</file> + </directory> + </if> + </directory> + <directory name="up"> + <file>halinit_up.c</file> + <file>pic.c</file> + <file>processor.c</file> + </directory> + </module> +</group> Propchange: branches/ros-amd64-bringup/reactos/hal/halx86/hal_mini.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sserapion] 46828: Conform to no leading underscores directive.
by sserapion＠svn.reactos.org 10 Apr '10

10 Apr '10

Author: sserapion Date: Sun Apr 11 00:34:29 2010 New Revision: 46828 URL: http://svn.reactos.org/svn/reactos?rev=46828&view=rev Log: Conform to no leading underscores directive. Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/amd64/seh.s branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/amd64/seh.s URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/amd64/seh.s [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/except/amd64/seh.s [iso-8859-1] Sun Apr 11 00:34:29 2010 @@ -17,40 +17,40 @@ /* GLOBALS *******************************************************************/ -.globl __global_unwind2 -.globl __local_unwind2 -.globl __abnormal_termination -.globl __except_handler2 -.globl __except_handler3 +.globl _global_unwind2 +.globl _local_unwind2 +.globl _abnormal_termination +.globl _except_handler2 +.globl _except_handler3 /* FUNCTIONS *****************************************************************/ -.func unwind_handler +.func _unwind_handler _unwind_handler: ret .endfunc .func _global_unwind2 -__global_unwind2: +_global_unwind2: ret .endfunc .func _abnormal_termination -__abnormal_termination: +_abnormal_termination: ret .endfunc .func _local_unwind2 -__local_unwind2: +_local_unwind2: ret .endfunc .func _except_handler2 -__except_handler2: +_except_handler2: ret .endfunc .func _except_handler3 -__except_handler3: +_except_handler3: ret .endfunc Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] Sun Apr 11 00:34:29 2010 @@ -26,7 +26,12 @@ /* Macros to define assembler functions somewhat portably */ #define __ASM_FUNC(name) ".def " __ASM_NAME(name) "; .scl 2; .type 32; .endef" + +#ifdef _M_AMD64 +#define __ASM_NAME(name) name +#else #define __ASM_NAME(name) "_" name +#endif #ifdef __GNUC__ # define __ASM_GLOBAL_FUNC(name,code) \

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs