Ros-diffs June 2011

ros-diffs@reactos.org

25 participants
460 discussions

[rharabien] 52234: [FREELDR] - Return const pointers instead of converting them - Fix MemoryMapSizeInPages calculation - Don't use pages after 4GB limit on x86 (PAE is not supported yet) - Should f...

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Jun 14 17:33:56 2011 New Revision: 52234 URL: http://svn.reactos.org/svn/reactos?rev=52234&view=rev Log: [FREELDR] - Return const pointers instead of converting them - Fix MemoryMapSizeInPages calculation - Don't use pages after 4GB limit on x86 (PAE is not supported yet) - Should fix starting ROS on 4GB machines See issue #6031 for more details. Modified: trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c trunk/reactos/boot/freeldr/freeldr/include/arcemul.h trunk/reactos/boot/freeldr/freeldr/include/machine.h trunk/reactos/boot/freeldr/freeldr/include/mm.h trunk/reactos/boot/freeldr/freeldr/mm/meminit.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arcem… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c [iso-8859-1] Tue Jun 14 17:33:56 2011 @@ -34,8 +34,8 @@ #endif }; -MEMORY_DESCRIPTOR* -ArcGetMemoryDescriptor(MEMORY_DESCRIPTOR* Current) +const MEMORY_DESCRIPTOR* +ArcGetMemoryDescriptor(const MEMORY_DESCRIPTOR* Current) { MEMORY_DESCRIPTOR_INT* CurrentDescriptor; BIOS_MEMORY_MAP BiosMemoryMap[32]; @@ -114,7 +114,7 @@ // // Return first fixed memory descriptor // - return (MEMORY_DESCRIPTOR*)&MemoryDescriptors[0].m; + return &MemoryDescriptors[0].m; } else { @@ -141,7 +141,7 @@ // // Return first fixed memory descriptor // - return (MEMORY_DESCRIPTOR*)&MemoryDescriptors[0].m; + return &MemoryDescriptors[0].m; } else { @@ -161,7 +161,7 @@ // // Return next fixed descriptor // - return (MEMORY_DESCRIPTOR*)&MemoryDescriptors[CurrentDescriptor->Index + 1].m; + return &MemoryDescriptors[CurrentDescriptor->Index + 1].m; } else { Modified: trunk/reactos/boot/freeldr/freeldr/include/arcemul.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arcemul.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arcemul.h [iso-8859-1] Tue Jun 14 17:33:56 2011 @@ -35,8 +35,8 @@ CONFIGURATION_COMPONENT* Component); /* mm.c */ -MEMORY_DESCRIPTOR* -ArcGetMemoryDescriptor(MEMORY_DESCRIPTOR* Current); +const MEMORY_DESCRIPTOR* +ArcGetMemoryDescriptor(const MEMORY_DESCRIPTOR* Current); /* time.c */ TIMEINFO* ArcGetTime(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] Tue Jun 14 17:33:56 2011 @@ -92,7 +92,6 @@ VOID MachVideoGetPaletteColor(UCHAR Color, UCHAR *Red, UCHAR *Green, UCHAR *Blue); VOID MachVideoSync(VOID); VOID MachBeep(VOID); -MEMORY_DESCRIPTOR* ArcGetMemoryDescriptor(MEMORY_DESCRIPTOR* Current); BOOLEAN MachDiskGetBootPath(char *BootPath, unsigned Size); BOOLEAN MachDiskNormalizeSystemPath(char *SystemPath, unsigned Size); BOOLEAN MachDiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] Tue Jun 14 17:33:56 2011 @@ -42,6 +42,7 @@ #define MM_PAGE_SIZE 4096 #define MM_PAGE_MASK 0xFFF #define MM_PAGE_SHIFT 12 +#define MM_MAX_PAGE 0xFFFFF #define MM_SIZE_TO_PAGES(a) \ ( ((a) >> MM_PAGE_SHIFT) + ((a) & MM_PAGE_MASK ? 1 : 0) ) @@ -53,6 +54,7 @@ #define MM_PAGE_SIZE 4096 #define MM_PAGE_MASK 0xFFF #define MM_PAGE_SHIFT 12 +#define MM_MAX_PAGE 0xFFFFFFFFFFFFF #define MM_SIZE_TO_PAGES(a) \ ( ((a) >> MM_PAGE_SHIFT) + ((a) & MM_PAGE_MASK ? 1 : 0) ) Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Tue Jun 14 17:33:56 2011 @@ -57,7 +57,7 @@ BOOLEAN MmInitializeMemoryManager(VOID) { #if DBG - MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; + const MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; #endif DPRINTM(DPRINT_MEMORY, "Initializing Memory Manager.\n"); @@ -158,7 +158,7 @@ ULONG MmGetAddressablePageCountIncludingHoles(VOID) { - MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; + const MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; ULONG PageCount; // @@ -197,7 +197,7 @@ PVOID MmFindLocationForPageLookupTable(ULONG TotalPageCount) { - MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; + const MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; ULONG PageLookupTableSize; ULONG PageLookupTablePages; ULONG PageLookupTableStartPage = 0; @@ -240,6 +240,17 @@ // Is it at a higher address than previous suitable address? // if (MemoryDescriptor->BasePage < PageLookupTableStartPage) + { + // + // No. Process next descriptor + // + continue; + } + + // + // Can we use this address? + // + if (MemoryDescriptor->BasePage >= MM_MAX_PAGE) { // // No. Process next descriptor @@ -263,7 +274,7 @@ VOID MmInitPageLookupTable(PVOID PageLookupTable, ULONG TotalPageCount) { - MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; + const MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; TYPE_OF_MEMORY MemoryMapPageAllocated; ULONG PageLookupTableStartPage; ULONG PageLookupTablePageCount; Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Tue Jun 14 17:33:56 2011 @@ -139,15 +139,27 @@ BOOLEAN Status; // - // Check for some weird stuff at the top - // - if (BasePage + PageCount > 0xF0000) + // Check for memory block after 4GB - we don't support it yet + // Note: Even last page before 4GB limit is not supported + // + if (BasePage >= MM_MAX_PAGE) { // // Just skip this, without even adding to MAD list // return; } + + // + // Check if last page is after 4GB limit and shorten this block if needed + // + if (BasePage + PageCount > MM_MAX_PAGE) + { + // + // shorten this block + // + PageCount = MM_MAX_PAGE - BasePage; + } // // Set Base page, page count and type @@ -255,7 +267,7 @@ // Calculate parameters of the memory map MemoryMapStartPage = (ULONG_PTR)MemoryMap >> MM_PAGE_SHIFT; - MemoryMapSizeInPages = NoEntries * sizeof(PAGE_LOOKUP_TABLE_ITEM); + MemoryMapSizeInPages = (NoEntries * sizeof(PAGE_LOOKUP_TABLE_ITEM) + MM_PAGE_SIZE - 1) / MM_PAGE_SIZE; DPRINTM(DPRINT_WINDOWS, "Got memory map with %d entries\n", NoEntries);

13 years, 6 months

[gadamopoulos] 52233: [uniata] - Fix compilation with msvc

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Jun 14 17:23:36 2011 New Revision: 52233 URL: http://svn.reactos.org/svn/reactos?rev=52233&view=rev Log: [uniata] - Fix compilation with msvc Modified: trunk/reactos/drivers/storage/ide/uniata/config.h trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp Modified: trunk/reactos/drivers/storage/ide/uniata/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/config.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/config.h [iso-8859-1] Tue Jun 14 17:23:36 2011 @@ -129,14 +129,10 @@ #define DEF_I64(x) (x##I64) /* ReactOS-specific defines */ - #ifdef USE_REACTOS_DDK - #else //USE_REACTOS_DDK #define DDKAPI __stdcall #define DDKFASTAPI __fastcall #define DDKCDECLAPI _cdecl - - #endif //DDKAPI #define DECLSPEC_NAKED __declspec(naked) Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Tue Jun 14 17:23:36 2011 @@ -243,6 +243,7 @@ } // end UniataSataEvent() ULONG +NTAPI UniataSataReadPort4( IN PHW_CHANNEL chan, IN ULONG io_port_ndx, @@ -311,6 +312,7 @@ } // end UniataSataReadPort4() VOID +NTAPI UniataSataWritePort4( IN PHW_CHANNEL chan, IN ULONG io_port_ndx,

13 years, 6 months

[akhaldi] 52232: [CMAKE] * Skip ftp, libxslt and ksproxy from msvc build. * Remove msvchelper.h as it's not needed anymore for d3d8 and d3d9. * Merge r50731 from the cmake branch. * Merge r50732 fr...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jun 14 17:04:03 2011 New Revision: 52232 URL: http://svn.reactos.org/svn/reactos?rev=52232&view=rev Log: [CMAKE] * Skip ftp, libxslt and ksproxy from msvc build. * Remove msvchelper.h as it's not needed anymore for d3d8 and d3d9. * Merge r50731 from the cmake branch. * Merge r50732 from the cmake branch and apply the same fix to state.c. Added: trunk/reactos/include/reactos/wine/math.h - copied unchanged from r50731, branches/cmake-bringup/include/reactos/wine/math.h Removed: trunk/reactos/include/reactos/msvchelper.h Modified: trunk/reactos/base/applications/network/CMakeLists.txt trunk/reactos/dll/3rdparty/CMakeLists.txt trunk/reactos/dll/directx/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h Modified: trunk/reactos/base/applications/network/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] Tue Jun 14 17:04:03 2011 @@ -2,7 +2,9 @@ add_subdirectory(arp) add_subdirectory(dwnl) add_subdirectory(finger) -add_subdirectory(ftp) +if(NOT MSVC) + add_subdirectory(ftp) # FIXME: fix msvc build +endif() add_subdirectory(ipconfig) add_subdirectory(net) add_subdirectory(netstat) @@ -10,7 +12,7 @@ add_subdirectory(ping) add_subdirectory(route) if(NOT MSVC) -add_subdirectory(telnet) + add_subdirectory(telnet) # FIXME: fix msvc build endif() add_subdirectory(tracert) add_subdirectory(whois) Modified: trunk/reactos/dll/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/CMakeLists.txt [iso-8859-1] Tue Jun 14 17:04:03 2011 @@ -5,7 +5,8 @@ add_subdirectory(libjpeg) add_subdirectory(libpng) add_subdirectory(libtiff) -add_subdirectory(libxslt) + if(NOT MSVC) -add_subdirectory(mesa32) + add_subdirectory(libxslt) + add_subdirectory(mesa32) endif() Modified: trunk/reactos/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/CMakeLists.txt… ============================================================================== --- trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] Tue Jun 14 17:04:03 2011 @@ -16,7 +16,9 @@ add_subdirectory(dsound) #add_subdirectory(dsound_new) #disabled in trunk add_subdirectory(dxdiagn) -add_subdirectory(ksproxy) +if(NOT MSVC) + add_subdirectory(ksproxy) #FIXME: fix msvc build +endif() add_subdirectory(ksuser) add_subdirectory(msdmo) #add_subdirectory(msdvbnp) #disabled in trunk Modified: trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/CMak… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] Tue Jun 14 17:04:03 2011 @@ -6,10 +6,6 @@ -DUSE_WIN32_OPENGL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -if(MSVC) - add_definitions(-FImsvchelper.h) -endif() set_rc_compiler() Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/CMak… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] Tue Jun 14 17:04:03 2011 @@ -6,10 +6,6 @@ -DUSE_WIN32_OPENGL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -if(MSVC) - add_definitions(-FImsvchelper.h) -endif() set_rc_compiler() Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] Tue Jun 14 17:04:03 2011 @@ -963,7 +963,7 @@ fogend = tmpvalue.f; /* In GL, fogstart == fogend disables fog, in D3D everything's fogged.*/ if(fogstart == fogend) { - fogstart = -1.0f / 0.0f; + fogstart = -1.0f * INFINITY; fogend = 0.0f; } break; Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] Tue Jun 14 17:04:03 2011 @@ -196,8 +196,8 @@ } else if(e < 31) { return sgn * powf(2, (float)e - 15.0f) * (1.0f + ((float)m / 1024.0f)); } else { - if(m == 0) return sgn / 0.0f; /* +INF / -INF */ - else return 0.0f / 0.0f; /* NAN */ + if(m == 0) return sgn * INFINITY; /* +INF / -INF */ + else return NAN; } } @@ -218,8 +218,8 @@ } else { - if (m == 0) return sgn / 0.0f; /* +INF / -INF */ - else return 0.0f / 0.0f; /* NAN */ + if (m == 0) return sgn * INFINITY; /* +INF / -INF */ + else return NAN; } } Removed: trunk/reactos/include/reactos/msvchelper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/msvchelper… ============================================================================== --- trunk/reactos/include/reactos/msvchelper.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/msvchelper.h (removed) @@ -1,32 +1,0 @@ - -// -#ifdef _M_IX86 -void __stdcall wined3d_mutex_lock(void); -void __stdcall wined3d_mutex_unlock(void); -void* __stdcall WineDirect3DCreate(unsigned int dxVersion,void *parent); - -void __inline wined3d_mutex_lock_inline(void) -{ - wined3d_mutex_lock(); -} - -void __inline wined3d_mutex_unlock_inline(void) -{ - wined3d_mutex_unlock(); -} - -__inline -struct IWineD3D* WineDirect3DCreate_inline(unsigned int dxVersion,void *parent) -{ - return WineDirect3DCreate(dxVersion, parent); -} - -#define wined3d_mutex_lock wined3d_mutex_lock_inline -#define wined3d_mutex_unlock wined3d_mutex_unlock_inline -#define WineDirect3DCreate WineDirect3DCreate_inline - -#endif /* _M_IX86 */ - - - -

13 years, 6 months

[akhaldi] 52231: [CMAKE] * Forward add_delay_importlibs to add_importlibs in msvc builds for now.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jun 14 16:19:57 2011 New Revision: 52231 URL: http://svn.reactos.org/svn/reactos?rev=52231&view=rev Log: [CMAKE] * Forward add_delay_importlibs to add_importlibs in msvc builds for now. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=52231… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue Jun 14 16:19:57 2011 @@ -167,7 +167,8 @@ endmacro() macro(add_delay_importlibs MODULE) -# TODO + # TODO. For now forward to normal import libs + add_importlibs(${MODULE} ${ARGN}) endmacro() macro(spec2def _dllname _spec_file)

13 years, 6 months

[akhaldi] 52230: [CMAKE] * Set a correct image base for freeldr_pe and setupldr_pe. Both now compile and link with MSVC.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jun 14 15:41:22 2011 New Revision: 52230 URL: http://svn.reactos.org/svn/reactos?rev=52230&view=rev Log: [CMAKE] * Set a correct image base for freeldr_pe and setupldr_pe. Both now compile and link with MSVC. Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Tue Jun 14 15:41:22 2011 @@ -188,7 +188,7 @@ endif() set_subsystem(freeldr_pe native) -set_image_base(freeldr_pe 0x9000) +set_image_base(freeldr_pe 0x10000) set_entrypoint(freeldr_pe RealEntryPoint) if(ARCH MATCHES i386) @@ -242,7 +242,7 @@ endif() set_subsystem(setupldr_pe native) -set_image_base(setupldr_pe 0x9000) +set_image_base(setupldr_pe 0x10000) set_entrypoint(setupldr_pe RealEntryPoint) if(ARCH MATCHES i386)

13 years, 6 months

[cmihail] 52229: [TCPIP] - Fix a bug on line 191, where the pending send requests for datagrams weren't canceled (the receive list was being used instead - Also added some formatting

by cmihail＠svn.reactos.org

Author: cmihail Date: Tue Jun 14 15:40:18 2011 New Revision: 52229 URL: http://svn.reactos.org/svn/reactos?rev=52229&view=rev Log: [TCPIP] - Fix a bug on line 191, where the pending send requests for datagrams weren't canceled (the receive list was being used instead - Also added some formatting Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Tue Jun 14 15:40:18 2011 @@ -112,7 +112,8 @@ TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); - while (CurrentEntry != &AddressFileListHead) { + while (CurrentEntry != &AddressFileListHead) + { Current = CONTAINING_RECORD(CurrentEntry, ADDRESS_FILE, ListEntry); IPAddress = &Current->Address; @@ -153,58 +154,63 @@ * Object = Pointer to address file object to free */ { - PADDRESS_FILE AddrFile = Object; - KIRQL OldIrql; - PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; - PDATAGRAM_SEND_REQUEST SendRequest; - PLIST_ENTRY CurrentEntry; - - TI_DbgPrint(MID_TRACE, ("Called.\n")); - - /* We should not be associated with a connection here */ - ASSERT(!AddrFile->Connection); - - /* Remove address file from the global list */ - TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); - RemoveEntryList(&AddrFile->ListEntry); - TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); - - /* FIXME: Kill TCP connections on this address file object */ - - /* Return pending requests with error */ - - TI_DbgPrint(DEBUG_ADDRFILE, ("Aborting receive requests on AddrFile at (0x%X).\n", AddrFile)); - - /* Go through pending receive request list and cancel them all */ - while ((CurrentEntry = ExInterlockedRemoveHeadList(&AddrFile->ReceiveQueue, &AddrFile->Lock))) { - ReceiveRequest = CONTAINING_RECORD(CurrentEntry, DATAGRAM_RECEIVE_REQUEST, ListEntry); - (*ReceiveRequest->Complete)(ReceiveRequest->Context, STATUS_CANCELLED, 0); - /* ExFreePoolWithTag(ReceiveRequest, DATAGRAM_RECV_TAG); FIXME: WTF? */ - } - - TI_DbgPrint(DEBUG_ADDRFILE, ("Aborting send requests on address file at (0x%X).\n", AddrFile)); - - /* Go through pending send request list and cancel them all */ - while ((CurrentEntry = ExInterlockedRemoveHeadList(&AddrFile->ReceiveQueue, &AddrFile->Lock))) { - SendRequest = CONTAINING_RECORD(CurrentEntry, DATAGRAM_SEND_REQUEST, ListEntry); - (*SendRequest->Complete)(SendRequest->Context, STATUS_CANCELLED, 0); - ExFreePoolWithTag(SendRequest, DATAGRAM_SEND_TAG); - } - - /* Protocol specific handling */ - switch (AddrFile->Protocol) { - case IPPROTO_TCP: - TCPFreePort( AddrFile->Port ); - break; - - case IPPROTO_UDP: - UDPFreePort( AddrFile->Port ); - break; - } - - RemoveEntityByContext(AddrFile); - - ExFreePoolWithTag(Object, ADDR_FILE_TAG); + PADDRESS_FILE AddrFile = Object; + KIRQL OldIrql; + PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; + PDATAGRAM_SEND_REQUEST SendRequest; + PLIST_ENTRY CurrentEntry; + + TI_DbgPrint(MID_TRACE, ("Called.\n")); + DbgPrint("[TCPIP, AddrFileFree] Called\n"); + + /* We should not be associated with a connection here */ + ASSERT(!AddrFile->Connection); + + /* Remove address file from the global list */ + TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); + RemoveEntryList(&AddrFile->ListEntry); + TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); + + /* FIXME: Kill TCP connections on this address file object */ + + /* Return pending requests with error */ + + TI_DbgPrint(DEBUG_ADDRFILE, ("Aborting receive requests on AddrFile at (0x%X).\n", AddrFile)); + + /* Go through pending receive request list and cancel them all */ + while ((CurrentEntry = ExInterlockedRemoveHeadList(&AddrFile->ReceiveQueue, &AddrFile->Lock))) + { + ReceiveRequest = CONTAINING_RECORD(CurrentEntry, DATAGRAM_RECEIVE_REQUEST, ListEntry); + (*ReceiveRequest->Complete)(ReceiveRequest->Context, STATUS_CANCELLED, 0); + /* ExFreePoolWithTag(ReceiveRequest, DATAGRAM_RECV_TAG); FIXME: WTF? */ + } + + TI_DbgPrint(DEBUG_ADDRFILE, ("Aborting send requests on address file at (0x%X).\n", AddrFile)); + + /* Go through pending send request list and cancel them all */ + while ((CurrentEntry = ExInterlockedRemoveHeadList(&AddrFile->TransmitQueue, &AddrFile->Lock))) + { + SendRequest = CONTAINING_RECORD(CurrentEntry, DATAGRAM_SEND_REQUEST, ListEntry); + (*SendRequest->Complete)(SendRequest->Context, STATUS_CANCELLED, 0); + ExFreePoolWithTag(SendRequest, DATAGRAM_SEND_TAG); + } + + /* Protocol specific handling */ + switch (AddrFile->Protocol) + { + case IPPROTO_TCP: + TCPFreePort( AddrFile->Port ); + break; + + case IPPROTO_UDP: + UDPFreePort( AddrFile->Port ); + break; + } + + RemoveEntityByContext(AddrFile); + + ExFreePoolWithTag(Object, ADDR_FILE_TAG); + DbgPrint("[TCPIP, AddrFileFree] Leaving\n"); } @@ -236,133 +242,136 @@ USHORT Protocol, PVOID Options) { - PADDRESS_FILE AddrFile; - - TI_DbgPrint(MID_TRACE, ("Called (Proto %d).\n", Protocol)); - DbgPrint("[TCPIP, FileOpenAddress] Called. Proto %d\n", Protocol); - - AddrFile = ExAllocatePoolWithTag(NonPagedPool, sizeof(ADDRESS_FILE), - ADDR_FILE_TAG); - if (!AddrFile) { - TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlZeroMemory(AddrFile, sizeof(ADDRESS_FILE)); - - AddrFile->RefCount = 1; - AddrFile->Free = AddrFileFree; - - /* Set our default options */ - AddrFile->TTL = 128; - AddrFile->DF = 0; - AddrFile->BCast = 1; - AddrFile->HeaderIncl = 1; - - /* Make sure address is a local unicast address or 0 */ - /* FIXME: IPv4 only */ - AddrFile->Family = Address->Address[0].AddressType; - AddrFile->Address.Address.IPv4Address = Address->Address[0].Address[0].in_addr; - AddrFile->Address.Type = IP_ADDRESS_V4; - - if (!AddrIsUnspecified(&AddrFile->Address) && - !AddrLocateInterface(&AddrFile->Address)) { - ExFreePoolWithTag(AddrFile, ADDR_FILE_TAG); - TI_DbgPrint(MIN_TRACE, ("Non-local address given (0x%X).\n", A2S(&AddrFile->Address))); - return STATUS_INVALID_ADDRESS; - } - - TI_DbgPrint(MID_TRACE, ("Opening address %s for communication (P=%d U=%d).\n", + PADDRESS_FILE AddrFile; + + TI_DbgPrint(MID_TRACE, ("Called (Proto %d).\n", Protocol)); + DbgPrint("[TCPIP, FileOpenAddress] Called. Proto %d\n", Protocol); + + AddrFile = ExAllocatePoolWithTag(NonPagedPool, sizeof(ADDRESS_FILE), + ADDR_FILE_TAG); + if (!AddrFile) + { + TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlZeroMemory(AddrFile, sizeof(ADDRESS_FILE)); + + AddrFile->RefCount = 1; + AddrFile->Free = AddrFileFree; + + /* Set our default options */ + AddrFile->TTL = 128; + AddrFile->DF = 0; + AddrFile->BCast = 1; + AddrFile->HeaderIncl = 1; + + /* Make sure address is a local unicast address or 0 */ + /* FIXME: IPv4 only */ + AddrFile->Family = Address->Address[0].AddressType; + AddrFile->Address.Address.IPv4Address = Address->Address[0].Address[0].in_addr; + AddrFile->Address.Type = IP_ADDRESS_V4; + + if (!AddrIsUnspecified(&AddrFile->Address) && + !AddrLocateInterface(&AddrFile->Address)) + { + ExFreePoolWithTag(AddrFile, ADDR_FILE_TAG); + TI_DbgPrint(MIN_TRACE, ("Non-local address given (0x%X).\n", A2S(&AddrFile->Address))); + return STATUS_INVALID_ADDRESS; + } + + TI_DbgPrint(MID_TRACE, ("Opening address %s for communication (P=%d U=%d).\n", A2S(&AddrFile->Address), Protocol, IPPROTO_UDP)); - /* Protocol specific handling */ - switch (Protocol) { - case IPPROTO_TCP: - AddrFile->Port = - TCPAllocatePort(Address->Address[0].Address[0].sin_port); - - if ((Address->Address[0].Address[0].sin_port && - AddrFile->Port != Address->Address[0].Address[0].sin_port) || - AddrFile->Port == 0xffff) - { - ExFreePoolWithTag(AddrFile, ADDR_FILE_TAG); - return STATUS_ADDRESS_ALREADY_EXISTS; - } - - AddEntity(CO_TL_ENTITY, AddrFile, CO_TL_TCP); - - AddrFile->Send = NULL; /* TCPSendData */ - break; - - case IPPROTO_UDP: - TI_DbgPrint(MID_TRACE,("Allocating udp port\n")); - AddrFile->Port = - UDPAllocatePort(Address->Address[0].Address[0].sin_port); - - if ((Address->Address[0].Address[0].sin_port && - AddrFile->Port != Address->Address[0].Address[0].sin_port) || - AddrFile->Port == 0xffff) - { - ExFreePoolWithTag(AddrFile, ADDR_FILE_TAG); - return STATUS_ADDRESS_ALREADY_EXISTS; - } - - TI_DbgPrint(MID_TRACE,("Setting port %d (wanted %d)\n", - AddrFile->Port, - Address->Address[0].Address[0].sin_port)); - - AddEntity(CL_TL_ENTITY, AddrFile, CL_TL_UDP); - - AddrFile->Send = UDPSendDatagram; - break; - - case IPPROTO_ICMP: - AddrFile->Port = 0; - AddrFile->Send = ICMPSendDatagram; - - /* FIXME: Verify this */ - AddEntity(ER_ENTITY, AddrFile, ER_ICMP); - break; - - default: - /* Use raw IP for all other protocols */ - AddrFile->Port = 0; - AddrFile->Send = RawIPSendDatagram; - - /* FIXME: Verify this */ - AddEntity(CL_TL_ENTITY, AddrFile, 0); - break; - } - - TI_DbgPrint(MID_TRACE, ("IP protocol number for address file object is %d.\n", + /* Protocol specific handling */ + switch (Protocol) + { + case IPPROTO_TCP: + AddrFile->Port = + TCPAllocatePort(Address->Address[0].Address[0].sin_port); + + if ((Address->Address[0].Address[0].sin_port && + AddrFile->Port != Address->Address[0].Address[0].sin_port) || + AddrFile->Port == 0xffff) + { + ExFreePoolWithTag(AddrFile, ADDR_FILE_TAG); + return STATUS_ADDRESS_ALREADY_EXISTS; + } + + AddEntity(CO_TL_ENTITY, AddrFile, CO_TL_TCP); + + AddrFile->Send = NULL; /* TCPSendData */ + break; + + case IPPROTO_UDP: + TI_DbgPrint(MID_TRACE,("Allocating udp port\n")); + AddrFile->Port = + UDPAllocatePort(Address->Address[0].Address[0].sin_port); + + if ((Address->Address[0].Address[0].sin_port && + AddrFile->Port != Address->Address[0].Address[0].sin_port) || + AddrFile->Port == 0xffff) + { + ExFreePoolWithTag(AddrFile, ADDR_FILE_TAG); + return STATUS_ADDRESS_ALREADY_EXISTS; + } + + TI_DbgPrint(MID_TRACE,("Setting port %d (wanted %d)\n", + AddrFile->Port, + Address->Address[0].Address[0].sin_port)); + + AddEntity(CL_TL_ENTITY, AddrFile, CL_TL_UDP); + + AddrFile->Send = UDPSendDatagram; + break; + + case IPPROTO_ICMP: + AddrFile->Port = 0; + AddrFile->Send = ICMPSendDatagram; + + /* FIXME: Verify this */ + AddEntity(ER_ENTITY, AddrFile, ER_ICMP); + break; + + default: + /* Use raw IP for all other protocols */ + AddrFile->Port = 0; + AddrFile->Send = RawIPSendDatagram; + + /* FIXME: Verify this */ + AddEntity(CL_TL_ENTITY, AddrFile, 0); + break; + } + + TI_DbgPrint(MID_TRACE, ("IP protocol number for address file object is %d.\n", Protocol)); - TI_DbgPrint(MID_TRACE, ("Port number for address file object is %d.\n", + TI_DbgPrint(MID_TRACE, ("Port number for address file object is %d.\n", WN2H(AddrFile->Port))); - /* Set protocol */ - AddrFile->Protocol = Protocol; - - /* Initialize receive and transmit queues */ - InitializeListHead(&AddrFile->ReceiveQueue); - InitializeListHead(&AddrFile->TransmitQueue); - - /* Initialize spin lock that protects the address file object */ - KeInitializeSpinLock(&AddrFile->Lock); - - /* Return address file object */ - Request->Handle.AddressHandle = AddrFile; - - /* Add address file to global list */ - ExInterlockedInsertTailList( - &AddressFileListHead, - &AddrFile->ListEntry, - &AddressFileListLock); - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - DbgPrint("[TCPIP, FileOpenAddress] Leaving\n"); - - return STATUS_SUCCESS; + /* Set protocol */ + AddrFile->Protocol = Protocol; + + /* Initialize receive and transmit queues */ + InitializeListHead(&AddrFile->ReceiveQueue); + InitializeListHead(&AddrFile->TransmitQueue); + + /* Initialize spin lock that protects the address file object */ + KeInitializeSpinLock(&AddrFile->Lock); + + /* Return address file object */ + Request->Handle.AddressHandle = AddrFile; + + /* Add address file to global list */ + ExInterlockedInsertTailList( + &AddressFileListHead, + &AddrFile->ListEntry, + &AddressFileListLock); + + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + DbgPrint("[TCPIP, FileOpenAddress] Leaving\n"); + + return STATUS_SUCCESS; } @@ -376,30 +385,33 @@ NTSTATUS FileCloseAddress( PTDI_REQUEST Request) { - PADDRESS_FILE AddrFile = Request->Handle.AddressHandle; - KIRQL OldIrql; - - DbgPrint("[TCPIP, FileCloseAddress] Called\n"); - - if (!Request->Handle.AddressHandle) return STATUS_INVALID_PARAMETER; - - LockObject(AddrFile, &OldIrql); - - /* We have to close this listener because we started it */ - if( AddrFile->Listener ) - { - AddrFile->Listener->AddressFile = NULL; - TCPClose( AddrFile->Listener ); - } - - DereferenceObject(AddrFile); - - UnlockObject(AddrFile, OldIrql); - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - DbgPrint("[TCPIP, FileCloseAddress] Leaving\n"); - - return STATUS_SUCCESS; + PADDRESS_FILE AddrFile = Request->Handle.AddressHandle; + KIRQL OldIrql; + + DbgPrint("[TCPIP, FileCloseAddress] Called\n"); + + if (!Request->Handle.AddressHandle) + return STATUS_INVALID_PARAMETER; + + LockObject(AddrFile, &OldIrql); + + /* We have to close this listener because we started it */ + if ( AddrFile->Listener ) + { + AddrFile->Listener->AddressFile = NULL; + TCPClose( AddrFile->Listener ); + } + + DbgPrint("[TCPIP, FileCloseAddress] AddrFile->RefCount = %d\n", AddrFile->RefCount); + + UnlockObject(AddrFile, OldIrql); + + DereferenceObject(AddrFile); + + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + DbgPrint("[TCPIP, FileCloseAddress] Leaving\n"); + + return STATUS_SUCCESS; } @@ -459,7 +471,8 @@ Connection = Request->Handle.ConnectionContext; - if (!Connection) return STATUS_INVALID_PARAMETER; + if (!Connection) + return STATUS_INVALID_PARAMETER; TCPClose( Connection );

13 years, 6 months

[akhaldi] 52228: [CMAKE] * Separate VS and NMake generators handling of asm source files.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jun 14 15:28:16 2011 New Revision: 52228 URL: http://svn.reactos.org/svn/reactos?rev=52228&view=rev Log: [CMAKE] * Separate VS and NMake generators handling of asm source files. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=52228… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue Jun 14 15:28:16 2011 @@ -33,11 +33,19 @@ set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") -get_directory_property(definitions DEFINITIONS) - -set(CMAKE_ASM_COMPILE_OBJECT - "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> ${definitions} /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" - "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") +if(MSVC_IDE) + # Asm source files are not supported in VS generators yet. As a result, <DEFINES> isn't recognized. + # We may temporarily use just the global defines, but this is not a solution as some modules (minihal for example) apply additional definitions to source files, so we get an incorrect build of such targets. + get_directory_property(definitions DEFINITIONS) + set(CMAKE_ASM_COMPILE_OBJECT + "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> ${definitions} /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" + "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") +else() + # NMake Makefiles + set(CMAKE_ASM_COMPILE_OBJECT + "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" + "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") +endif() set(CMAKE_RC_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY}) set(CMAKE_ASM_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY})

13 years, 6 months

[tkreuzer] 52227: [FREELDR] Reimplement Int386 based on realmode callback mechanism.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jun 14 14:53:02 2011 New Revision: 52227 URL: http://svn.reactos.org/svn/reactos?rev=52227&view=rev Log: [FREELDR] Reimplement Int386 based on realmode callback mechanism. Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Tue Jun 14 14:53:02 2011 @@ -19,7 +19,6 @@ arch/i386/i386pnp.S arch/i386/i386pxe.S arch/i386/i386trap.S - arch/i386/int386.S arch/i386/linux.S arch/i386/mb.S arch/i386/i386bug.c) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] Tue Jun 14 14:53:02 2011 @@ -63,8 +63,6 @@ mov eax, dword ptr ds:[BSS_RealModeEntry] mov dword ptr ds:[SwitchToReal16Address], eax -call _Int386_ // test - /* GO! */ xor eax, eax push eax @@ -222,8 +220,25 @@ _EnableA20: ret -PUBLIC _Int386_ -_Int386_: +Int386_regsin: + .long 0 +Int386_regsout: + .long 0 + +/* + * int Int386(int ivec, REGS* in, REGS* out); + */ +PUBLIC _Int386 +_Int386: + + /* Get the function parameters */ + mov eax, dword ptr [esp + 4] + mov dword ptr ds:[BSS_IntVector], eax + mov eax, dword ptr [esp + 8] + mov dword ptr [Int386_regsin], eax + mov eax, dword ptr [esp + 12] + mov dword ptr [Int386_regsout], eax + /* Save all registers + segment registers */ push ds push es @@ -231,14 +246,26 @@ push gs pusha + /* Copy input registers */ + mov esi, dword ptr [Int386_regsin] + mov edi, BSS_RegisterSet + mov ecx, 9 + rep movsd + /* Set the callback index */ - mov cx, 1234 + mov bx, 0 /* Set continue address and switch to real mode */ mov dword ptr [ContinueAddress], offset Int386_return jmp SwitchToReal Int386_return: + + /* Copy output registers */ + mov esi, BSS_RegisterSet + mov edi, dword ptr [Int386_regsout] + mov ecx, 9 + rep movsd popa pop gs Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] Tue Jun 14 14:53:02 2011 @@ -91,10 +91,10 @@ sti /* These are ok now */ - /* Do the callback, specified by cx */ - // call word ptr CallbackTable[cx * 4] - mov ax, cx - call writehex4 + /* Do the callback, specified by bx */ + shl bx, 1 + call word ptr ds:[callback_table + bx] + /* * Switches the processor to protected mode @@ -123,6 +123,8 @@ nop +callback_table: + .word Int386 /* 16-bit stack pointer */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc [iso-8859-1] Tue Jun 14 14:53:02 2011 @@ -1,26 +1,33 @@ Int386: + /* Save all registers + segment registers */ + push ds + push es + push fs + push gs + pushad + /* Get the interupt vector and patch the opcode */ mov al, byte ptr ds:[BSS_IntVector] mov byte ptr ds:[Int386_vector_opcode], al /* Setup the registers */ mov ax, word ptr cs:[BSS_RegisterSet + REGS_DS] - mov ds, ax /* DS register */ + mov ds, ax mov ax, word ptr cs:[BSS_RegisterSet + REGS_ES] - mov es, ax /* ES register */ + mov es, ax mov ax, word ptr cs:[BSS_RegisterSet + REGS_FS] - mov fs, ax /* FS register */ + mov fs, ax mov ax, word ptr cs:[BSS_RegisterSet + REGS_GS] - mov gs, ax /* GS register */ + mov gs, ax - mov eax, dword ptr cs:[BSS_RegisterSet + REGS_EAX] /* EAX register */ - mov ebx, dword ptr cs:[BSS_RegisterSet + REGS_EBX] /* EBX register */ - mov ecx, dword ptr cs:[BSS_RegisterSet + REGS_ECX] /* ECX register */ - mov edx, dword ptr cs:[BSS_RegisterSet + REGS_EDX] /* EDX register */ - mov esi, dword ptr cs:[BSS_RegisterSet + REGS_ESI] /* ESI register */ - mov edi, dword ptr cs:[BSS_RegisterSet + REGS_EDI] /* EDI register */ + mov eax, dword ptr cs:[BSS_RegisterSet + REGS_EAX] + mov ebx, dword ptr cs:[BSS_RegisterSet + REGS_EBX] + mov ecx, dword ptr cs:[BSS_RegisterSet + REGS_ECX] + mov edx, dword ptr cs:[BSS_RegisterSet + REGS_EDX] + mov esi, dword ptr cs:[BSS_RegisterSet + REGS_ESI] + mov edi, dword ptr cs:[BSS_RegisterSet + REGS_EDI] /* Do not set the flags register */ /* only return its value in regsout */ @@ -32,24 +39,30 @@ .byte 0x00 /* Save the registers */ - mov dword ptr cs:[BSS_RegisterSet + REGS_EAX], eax /* EAX register */ - mov dword ptr cs:[BSS_RegisterSet + REGS_EBX], ebx /* EBX register */ - mov dword ptr cs:[BSS_RegisterSet + REGS_ECX], ecx /* ECX register */ - mov dword ptr cs:[BSS_RegisterSet + REGS_EDX], edx /* EDX register */ - mov dword ptr cs:[BSS_RegisterSet + REGS_ESI], esi /* ESI register */ - mov dword ptr cs:[BSS_RegisterSet + REGS_EDI], edi /* EDI register */ + mov dword ptr cs:[BSS_RegisterSet + REGS_EAX], eax + mov dword ptr cs:[BSS_RegisterSet + REGS_EBX], ebx + mov dword ptr cs:[BSS_RegisterSet + REGS_ECX], ecx + mov dword ptr cs:[BSS_RegisterSet + REGS_EDX], edx + mov dword ptr cs:[BSS_RegisterSet + REGS_ESI], esi + mov dword ptr cs:[BSS_RegisterSet + REGS_EDI], edi - mov ax, ds /* DS register */ + mov ax, ds mov word ptr cs:[BSS_RegisterSet + REGS_DS], ax - mov ax, es /* ES register */ + mov ax, es mov word ptr cs:[BSS_RegisterSet + REGS_ES], ax - mov ax, fs /* FS register */ + mov ax, fs mov word ptr cs:[BSS_RegisterSet + REGS_FS], ax - mov ax, gs /* GS register */ + mov ax, gs mov word ptr cs:[BSS_RegisterSet + REGS_GS], ax - pushf - pop dword ptr cs:[BSS_RegisterSet + REGS_EFLAGS] /* EFLAGS register */ + pushfd + pop dword ptr cs:[BSS_RegisterSet + REGS_EFLAGS] + + popad + pop gs + pop fs + pop es + pop ds ret

13 years, 6 months

[tkreuzer] 52226: [FREELDR] Start implementing a realmode callback mechanism

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jun 14 12:17:28 2011 New Revision: 52226 URL: http://svn.reactos.org/svn/reactos?rev=52226&view=rev Log: [FREELDR] Start implementing a realmode callback mechanism Added: trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] Tue Jun 14 12:17:28 2011 @@ -44,9 +44,9 @@ lidt i386idtptr /* Continue execution */ - jmp dword ptr [_ContinueAddress] - -_ContinueAddress: + jmp dword ptr [ContinueAddress] + +ContinueAddress: .long _FrldrStartup @@ -58,6 +58,12 @@ mov dword ptr [_FrldrBootDrive], eax mov al, dh mov dword ptr [_FrldrBootPartition], eax + + /* Patch long jump with real mode entry point */ + mov eax, dword ptr ds:[BSS_RealModeEntry] + mov dword ptr ds:[SwitchToReal16Address], eax + +call _Int386_ // test /* GO! */ xor eax, eax @@ -215,6 +221,51 @@ PUBLIC _EnableA20 _EnableA20: ret + +PUBLIC _Int386_ +_Int386_: + /* Save all registers + segment registers */ + push ds + push es + push fs + push gs + pusha + + /* Set the callback index */ + mov cx, 1234 + + /* Set continue address and switch to real mode */ + mov dword ptr [ContinueAddress], offset Int386_return + jmp SwitchToReal + +Int386_return: + + popa + pop gs + pop fs + pop es + pop ds + ret + + +SwitchToReal: + /* Set sane segments */ + mov ax, PMODE_DS + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov ss, ax + + /* Save 32-bit stack pointer */ + mov dword ptr [stack32], esp + + /* jmp to 16-bit segment to set the limit correctly */ + .byte HEX(0ea) // jmp far RMODE_CS:switch_to_real16 +SwitchToReal16Address: + .long 0 // receives address of switch_to_real16 + .word RMODE_CS + nop /* Multiboot support Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] Tue Jun 14 12:17:28 2011 @@ -30,6 +30,9 @@ /* Enable A20 address line */ call EnableA20 + /* Safe real mode entry point in shared memory */ + mov dword ptr [BSS_RealModeEntry], offset switch_to_real16 + /* Get address of optional header */ mov eax, dword ptr ds:[FREELDR_PE_BASE + IMAGE_DOS_HEADER_e_lfanew] add eax, FREELDR_PE_BASE + 4 + IMAGE_FILE_HEADER_SIZE @@ -38,20 +41,74 @@ mov eax, dword ptr ds:[eax + IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint] add eax, FREELDR_PE_BASE - /* Safe the entry point */ - mov dword ptr [BSS_EntryPoint], eax - /* Patch the long jump instruction */ mov word ptr [pm_offset], ax + + jmp exit_to_protected + + +/* This is the entry point from protected mode */ +switch_to_real16: + + /* Restore segment registers to correct limit */ + mov ax, RMODE_DS + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov ss, ax + + /* Disable Protected Mode */ + mov eax, cr0 + and eax, CR0_PE_CLR + mov cr0, eax + + /* Clear prefetch queue & correct CS */ + ljmp16 0, inrmode + +inrmode: + /* Set real mode segments */ + xor ax, ax + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov ss, ax + + /* Clear out the high 16-bits of ESP */ + /* This is needed because I have one */ + /* machine that hangs when booted to dos if */ + /* anything other than 0x0000 is in the high */ + /* 16-bits of ESP. Even though real-mode */ + /* code should only use SP and not ESP. */ + xor esp, esp + + /* Restore real mode stack */ + mov sp, word ptr ds:[stack16] + + /* Load IDTR with real mode value */ + lidt rmode_idtptr + + sti /* These are ok now */ + + /* Do the callback, specified by cx */ + // call word ptr CallbackTable[cx * 4] + mov ax, cx + call writehex4 /* * Switches the processor to protected mode * it destroys eax */ -switch_to_prot: +exit_to_protected: + + cli + + /* Safe current stack pointer */ + mov word ptr ds:[stack16], sp /* Load the GDT */ - lgdt gdtptr + lgdt gdtptr /* Enable Protected Mode */ mov eax, cr0 @@ -64,6 +121,7 @@ .word 0 // receives address of PE entry point .word PMODE_CS nop + @@ -109,8 +167,14 @@ .word HEX(27) /* Limit */ .long gdt /* Base Address */ -.org 1024 +/* Real-mode IDT pointer */ +rmode_idtptr: + .word HEX(3ff) /* Limit */ + .long 0 /* Base Address */ +//.org 1024 + +#include "int386.inc" #include "helpers.inc" .org (FREELDR_PE_BASE - FREELDR_BASE) Added: trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc [iso-8859-1] Tue Jun 14 12:17:28 2011 @@ -1,0 +1,57 @@ + + +Int386: + /* Get the interupt vector and patch the opcode */ + mov al, byte ptr ds:[BSS_IntVector] + mov byte ptr ds:[Int386_vector_opcode], al + + /* Setup the registers */ + mov ax, word ptr cs:[BSS_RegisterSet + REGS_DS] + mov ds, ax /* DS register */ + mov ax, word ptr cs:[BSS_RegisterSet + REGS_ES] + mov es, ax /* ES register */ + mov ax, word ptr cs:[BSS_RegisterSet + REGS_FS] + mov fs, ax /* FS register */ + mov ax, word ptr cs:[BSS_RegisterSet + REGS_GS] + mov gs, ax /* GS register */ + + mov eax, dword ptr cs:[BSS_RegisterSet + REGS_EAX] /* EAX register */ + mov ebx, dword ptr cs:[BSS_RegisterSet + REGS_EBX] /* EBX register */ + mov ecx, dword ptr cs:[BSS_RegisterSet + REGS_ECX] /* ECX register */ + mov edx, dword ptr cs:[BSS_RegisterSet + REGS_EDX] /* EDX register */ + mov esi, dword ptr cs:[BSS_RegisterSet + REGS_ESI] /* ESI register */ + mov edi, dword ptr cs:[BSS_RegisterSet + REGS_EDI] /* EDI register */ + + /* Do not set the flags register */ + /* only return its value in regsout */ + + /* Call the interrupt vector */ + /*int Int386_vector*/ + .byte 0xcd +Int386_vector_opcode: + .byte 0x00 + + /* Save the registers */ + mov dword ptr cs:[BSS_RegisterSet + REGS_EAX], eax /* EAX register */ + mov dword ptr cs:[BSS_RegisterSet + REGS_EBX], ebx /* EBX register */ + mov dword ptr cs:[BSS_RegisterSet + REGS_ECX], ecx /* ECX register */ + mov dword ptr cs:[BSS_RegisterSet + REGS_EDX], edx /* EDX register */ + mov dword ptr cs:[BSS_RegisterSet + REGS_ESI], esi /* ESI register */ + mov dword ptr cs:[BSS_RegisterSet + REGS_EDI], edi /* EDI register */ + + mov ax, ds /* DS register */ + mov word ptr cs:[BSS_RegisterSet + REGS_DS], ax + mov ax, es /* ES register */ + mov word ptr cs:[BSS_RegisterSet + REGS_ES], ax + mov ax, fs /* FS register */ + mov word ptr cs:[BSS_RegisterSet + REGS_FS], ax + mov ax, gs /* GS register */ + mov word ptr cs:[BSS_RegisterSet + REGS_GS], ax + + pushf + pop dword ptr cs:[BSS_RegisterSet + REGS_EFLAGS] /* EFLAGS register */ + + ret + + + Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] Tue Jun 14 12:17:28 2011 @@ -17,11 +17,26 @@ #define DISKREADBUFFER_SIZE 512 /* These addresses specify the realmode "BSS section" layout */ -#define BSS_EntryPoint (BSS_START + 0) +#define BSS_RealModeEntry (BSS_START + 0) #define BSS_CallbackAddress (BSS_START + 4) #define BSS_CallbackReturn (BSS_START + 8) -#define BSS_BootDrive (BSS_START + 12) -#define BSS_BootPartition (BSS_START + 16) + +#define BSS_RegisterSet (BSS_START + 16) /* size = 36 */ +#define BSS_IntVector (BSS_START + 52) +// next 52 + +/* Layout of the REGS structure */ +#define REGS_EAX 0 +#define REGS_EBX 4 +#define REGS_ECX 8 +#define REGS_EDX 12 +#define REGS_ESI 16 +#define REGS_EDI 20 +#define REGS_DS 24 +#define REGS_ES 26 +#define REGS_FS 28 +#define REGS_GS 30 +#define REGS_EFLAGS 32 // Flag Masks

13 years, 6 months

[tkreuzer] 52225: [FREELDR] Move EnableA20 to realmode code, remove DisableA20

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jun 14 08:10:59 2011 New Revision: 52225 URL: http://svn.reactos.org/svn/reactos?rev=52225&view=rev Log: [FREELDR] Move EnableA20 to realmode code, remove DisableA20 Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] Tue Jun 14 08:10:59 2011 @@ -211,69 +211,11 @@ ret - /* - * Needed for enabling the a20 address line - */ -.code16 -empty_8042: - .word 0x00eb,0x00eb // jmp $+2, jmp $+2 - in al, HEX(64) - cmp al, HEX(ff) // legacy-free machine without keyboard - jz empty_8042_ret // controllers on Intel Macs read back 0xFF - test al, 2 - jnz empty_8042 -empty_8042_ret: - ret - - /* - * Enable the A20 address line (to allow access to over 1mb) - */ -EXTERN(_EnableA20) .code32 - - pusha - - call switch_to_real -.code16 - - call empty_8042 - mov al, HEX(D1) // command write - out HEX(64), al - call empty_8042 - mov al, HEX(DF) // A20 on - out HEX(60), al - call empty_8042 - call switch_to_prot - .code32 - - popa - - ret - - /* - * Disable the A20 address line - */ -EXTERN(_DisableA20) -.code32 - - pusha - - call switch_to_real - .code16 - - call empty_8042 - mov al, HEX(D1) // command write - out HEX(64), al - call empty_8042 - mov al, HEX(DD) // A20 off - out HEX(60), al - call empty_8042 - call switch_to_prot - .code32 - - popa - - ret +PUBLIC _EnableA20 +_EnableA20: + ret + /* Multiboot support * Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc [iso-8859-1] Tue Jun 14 08:10:59 2011 @@ -3,21 +3,21 @@ .word 0x00eb,0x00eb // jmp $+2, jmp $+2 in al, 0x64 cmp al, 0xff // legacy-free machine without keyboard - jz empty_8042_ret // controllers on Intel Macs read back 0xFF + jz Empty8042_ret // controllers on Intel Macs read back 0xFF test al, 0x02 - jnz x86_16_Empty8042 -empty_8042_ret: + jnz Empty8042 +Empty8042_ret: ret EnableA20: pusha - call x86_16_Empty8042 + call Empty8042 mov al, 0xD1 // command write out 0x64, al - call x86_16_Empty8042 + call Empty8042 mov al, 0xDF // A20 on out 0x60, al - call x86_16_Empty8042 + call Empty8042 popa ret Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] Tue Jun 14 08:10:59 2011 @@ -26,6 +26,9 @@ /* Setup the stack */ mov sp, word ptr ds:stack16 + + /* Enable A20 address line */ + call EnableA20 /* Get address of optional header */ mov eax, dword ptr ds:[FREELDR_PE_BASE + IMAGE_DOS_HEADER_e_lfanew]

13 years, 6 months

← Newer
1
...
24
25
26
27
28
29
30
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2011