Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ros-arm-bringup] 41879: Fix PSEH2 ARM neutering
by ros-arm-bringup＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: ros-arm-bringup Date: Sat Jul 11 17:02:22 2009 New Revision: 41879 URL: http://svn.reactos.org/svn/reactos?rev=41879&view=rev Log: Fix PSEH2 ARM neutering Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Sat Jul 11 17:02:22 2009 @@ -421,8 +421,6 @@ #endif -#endif - #else #define _SEH2_TRY { @@ -435,7 +433,9 @@ #define _SEH2_AbnormalTermination() #define _SEH2_YIELD(STMT_) STMT_ -#define _SEH2_LEAVE +#define _SEH2_LEAVE + +#endif #endif

1 0

[ros-arm-bringup] 41878: Also define PAGE_SIZE in armddk.h if it isn't already defined (allows cmlib to compile, amongst others)
by ros-arm-bringup＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: ros-arm-bringup Date: Sat Jul 11 17:00:09 2009 New Revision: 41878 URL: http://svn.reactos.org/svn/reactos?rev=41878&view=rev Log: Also define PAGE_SIZE in armddk.h if it isn't already defined (allows cmlib to compile, amongst others) Modified: trunk/reactos/include/reactos/arm/armddk.h Modified: trunk/reactos/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/armddk… ============================================================================== --- trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] Sat Jul 11 17:00:09 2009 @@ -15,6 +15,13 @@ #define IPI_LEVEL 29 #define POWER_LEVEL 30 #define HIGH_LEVEL 31 + +// +// Page size +// +#ifndef PAGE_SIZE +#define PAGE_SIZE 0x1000 +#endif // // FIXME: mmtypes.h?

1 0

[ros-arm-bringup] 41877: GAS should also receive the -march flag, not just the compiler... otherwise, gcc won't let you use things like "cmov" on x86, or anything beyond the armv4 instruction set on ARM
by ros-arm-bringup＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: ros-arm-bringup Date: Sat Jul 11 16:57:41 2009 New Revision: 41877 URL: http://svn.reactos.org/svn/reactos?rev=41877&view=rev Log: GAS should also receive the -march flag, not just the compiler... otherwise, gcc won't let you use things like "cmov" on x86, or anything beyond the armv4 instruction set on ARM Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sat Jul 11 16:57:41 2009 @@ -456,6 +456,7 @@ if ( ProjectNode.configuration.Compiler == GnuGcc ) { fprintf ( fMakefile, "ifneq ($(OARCH),)\n" ); + fprintf ( fMakefile, "PROJECT_ASFLAGS += -march=$(OARCH)\n" ); fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" ); fprintf ( fMakefile, "PROJECT_CXXFLAGS += -march=$(OARCH)\n" ); fprintf ( fMakefile, "endif\n" );

1 0

[ros-arm-bringup] 41876: WINNT.H already defines CONTEXT so avoid a double-definition if ARMDDK is included
by ros-arm-bringup＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: ros-arm-bringup Date: Sat Jul 11 16:36:20 2009 New Revision: 41876 URL: http://svn.reactos.org/svn/reactos?rev=41876&view=rev Log: WINNT.H already defines CONTEXT so avoid a double-definition if ARMDDK is included Modified: trunk/reactos/include/reactos/arm/armddk.h Modified: trunk/reactos/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/armddk… ============================================================================== --- trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] Sat Jul 11 16:36:20 2009 @@ -58,6 +58,7 @@ ULONG Reserved; } KFLOATING_SAVE, *PKFLOATING_SAVE; +#ifndef _WINNT_H /* The following flags control the contents of the CONTEXT structure. */ #define CONTEXT_ARM 0x0000040 #define CONTEXT_CONTROL (CONTEXT_ARM | 0x00000001L) @@ -104,6 +105,7 @@ ULONG Pc; ULONG Psr; } CONTEXT; +#endif // // Processor Control Region

1 0

[ros-arm-bringup] 41875: Define PAGE_SIZE in winnt.h for now, for modules that don't include the NDK, and then make the NDK and WINNT.H safe to use combined
by ros-arm-bringup＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: ros-arm-bringup Date: Sat Jul 11 16:35:29 2009 New Revision: 41875 URL: http://svn.reactos.org/svn/reactos?rev=41875&view=rev Log: Define PAGE_SIZE in winnt.h for now, for modules that don't include the NDK, and then make the NDK and WINNT.H safe to use combined Modified: trunk/reactos/include/ndk/arm/mmtypes.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/ndk/arm/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/mmtypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] Sat Jul 11 16:35:29 2009 @@ -26,7 +26,9 @@ // // Page-related Macros // +#ifndef PAGE_SIZE #define PAGE_SIZE 0x1000 +#endif #define PAGE_SHIFT 12L #define MM_ALLOCATION_GRANULARITY 0x10000 #define MM_ALLOCATION_GRANULARITY_SHIFT 16L Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Jul 11 16:35:29 2009 @@ -2846,6 +2846,10 @@ } CONTEXT; #elif defined(ARM) +#ifndef PAGE_SIZE +#define PAGE_SIZE 0x1000 // FIXME: This should probably go elsewhere +#endif + /* The following flags control the contents of the CONTEXT structure. */ #define CONTEXT_ARM 0x0000040

1 0

[ros-arm-bringup] 41874: How was this code even supposed to compile???
by ros-arm-bringup＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: ros-arm-bringup Date: Sat Jul 11 16:34:25 2009 New Revision: 41874 URL: http://svn.reactos.org/svn/reactos?rev=41874&view=rev Log: How was this code even supposed to compile??? Modified: trunk/reactos/lib/sdk/crt/mem/memcpy.c Modified: trunk/reactos/lib/sdk/crt/mem/memcpy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memcpy.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/memcpy.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/memcpy.c [iso-8859-1] Sat Jul 11 16:34:25 2009 @@ -1,7 +1,7 @@ #include <string.h> /* NOTE: This code is a duplicate of memmove implementation! */ -void* memcpy(void* to, const void* from, size_t count) +void* memcpy(void* dest, const void* src, size_t count) { char *char_dest = (char *)dest; char *char_src = (char *)src;

1 0

[ros-arm-bringup] 41873: Make rotl what the headers expect
by ros-arm-bringup＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: ros-arm-bringup Date: Sat Jul 11 16:33:10 2009 New Revision: 41873 URL: http://svn.reactos.org/svn/reactos?rev=41873&view=rev Log: Make rotl what the headers expect Modified: trunk/reactos/include/crt/mingw32/intrin_arm.h Modified: trunk/reactos/include/crt/mingw32/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_arm.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_arm.h [iso-8859-1] Sat Jul 11 16:33:10 2009 @@ -315,7 +315,7 @@ } #ifndef __MSVCRT__ -__INTRIN_INLINE unsigned long _rotl(const unsigned long value, const unsigned char shift) +__INTRIN_INLINE unsigned int _rotl(const unsigned int value, int shift) { return (((value) << ((int)(shift))) | ((value) >> (32 - (int)(shift)))); }

1 0

[ros-arm-bringup] 41872: Neuter PSEH2 on ARM
by ros-arm-bringup＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: ros-arm-bringup Date: Sat Jul 11 16:32:38 2009 New Revision: 41872 URL: http://svn.reactos.org/svn/reactos?rev=41872&view=rev Log: Neuter PSEH2 on ARM Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Sat Jul 11 16:32:38 2009 @@ -22,6 +22,8 @@ #ifndef KJK_PSEH2_H_ #define KJK_PSEH2_H_ + +#if !defined (__arm__) #if defined(__GNUC__) struct _EXCEPTION_RECORD; @@ -421,4 +423,20 @@ #endif +#else + +#define _SEH2_TRY { +#define _SEH2_FINALLY } { +#define _SEH2_EXCEPT(...) } if (0 && __VA_ARGS__) { +#define _SEH2_END } + +#define _SEH2_GetExceptionInformation() +#define _SEH2_GetExceptionCode() STATUS_SUCCESS +#define _SEH2_AbnormalTermination() + +#define _SEH2_YIELD(STMT_) STMT_ +#define _SEH2_LEAVE + +#endif + /* EOF */

1 0

[ros-arm-bringup] 41871: Define ALLOCA_S_MARKER_SIZE for arm
by ros-arm-bringup＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: ros-arm-bringup Date: Sat Jul 11 16:32:09 2009 New Revision: 41871 URL: http://svn.reactos.org/svn/reactos?rev=41871&view=rev Log: Define ALLOCA_S_MARKER_SIZE for arm Modified: trunk/reactos/include/crt/malloc.h Modified: trunk/reactos/include/crt/malloc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/malloc.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/malloc.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/malloc.h [iso-8859-1] Sat Jul 11 16:32:09 2009 @@ -104,6 +104,8 @@ #define _ALLOCA_S_MARKER_SIZE 8 #elif defined(__ia64__) || defined(__x86_64) #define _ALLOCA_S_MARKER_SIZE 16 +#elif defined(__arm__) +#define _ALLOCA_S_MARKER_SIZE 8 #endif #if !defined(RC_INVOKED)

1 0

[ros-arm-bringup] 41870: Just cause it ain't AMD64 ain't meaning it's just x86... so make the macro x86-inclusive instead of x64-exclusive (since we don't want those definitions on ARM either)
by ros-arm-bringup＠svn.reactos.org 11 Jul '09

11 Jul '09

Author: ros-arm-bringup Date: Sat Jul 11 16:04:26 2009 New Revision: 41870 URL: http://svn.reactos.org/svn/reactos?rev=41870&view=rev Log: Just cause it ain't AMD64 ain't meaning it's just x86... so make the macro x86-inclusive instead of x64-exclusive (since we don't want those definitions on ARM either) Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/reactos.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/reactos.h [iso-8859-1] Sat Jul 11 16:04:26 2009 @@ -23,7 +23,7 @@ /* Base Addres of Kernel in Physical Memory */ #define KERNEL_BASE_PHYS 0x800000 -#if !defined(_M_AMD64) +#if defined(_M_IX86) /* Bits to shift to convert a Virtual Address into an Offset in the Page Table */ #define PFN_SHIFT 12

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