Ros-diffs January 2015

ros-diffs@reactos.org

17 participants
207 discussions

[jimtabor] 66135: [NtUser] - Add default setting to Foreground Flash Count. Should fix flash.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jan 31 23:30:30 2015 New Revision: 66135 URL: http://svn.reactos.org/svn/reactos?rev=66135&view=rev Log: [NtUser] - Add default setting to Foreground Flash Count. Should fix flash. Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] Sat Jan 31 23:30:30 2015 @@ -295,6 +295,7 @@ gspv.bMenuDropAlign = 1; gspv.bDropShadow = 1; gspv.dwMenuShowDelay = 100; + gspv.dwForegroundFlashCount = 3; gspv.iScrSaverTimeout = SpiLoadTimeOut(); gspv.bScrSaverActive = FALSE;

9 years, 10 months

[aandrejevic] 66134: [FAST486] Implement FLDENV and FRSTOR.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Jan 31 22:47:05 2015 New Revision: 66134 URL: http://svn.reactos.org/svn/reactos?rev=66134&view=rev Log: [FAST486] Implement FLDENV and FRSTOR. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6613… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sat Jan 31 22:47:05 2015 @@ -920,6 +920,49 @@ } static inline BOOLEAN FASTCALL +Fast486FpuLoadEnvironment(PFAST486_STATE State, + INT Segment, + ULONG Address, + BOOLEAN Size) +{ + UCHAR Buffer[28]; + + if (!Fast486ReadMemory(State, Segment, Address, FALSE, Buffer, (Size + 1) * 14)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check if this is a 32-bit save or a 16-bit save */ + if (Size) + { + PULONG Data = (PULONG)Buffer; + + State->FpuControl.Value = (USHORT)Data[0]; + State->FpuStatus.Value = (USHORT)Data[1]; + State->FpuTag = (USHORT)Data[2]; + State->FpuLastInstPtr.Long = Data[3]; + State->FpuLastCodeSel = (USHORT)Data[4]; + State->FpuLastOpPtr.Long = Data[5]; + State->FpuLastDataSel = (USHORT)Data[6]; + } + else + { + PUSHORT Data = (PUSHORT)Buffer; + + State->FpuControl.Value = Data[0]; + State->FpuStatus.Value = Data[1]; + State->FpuTag = Data[2]; + State->FpuLastInstPtr.LowWord = Data[3]; + State->FpuLastCodeSel = Data[4]; + State->FpuLastOpPtr.LowWord = Data[5]; + State->FpuLastDataSel = Data[6]; + } + + return TRUE; +} + +static inline BOOLEAN FASTCALL Fast486FpuSaveEnvironment(PFAST486_STATE State, INT Segment, ULONG Address, @@ -1136,9 +1179,11 @@ /* FLDENV */ case 4: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - + Fast486FpuLoadEnvironment(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? FAST486_REG_DS : State->SegmentOverride, + ModRegRm.MemoryAddress, + OperandSize); break; } @@ -1698,8 +1743,47 @@ /* FRSTOR */ case 4: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + INT i; + UCHAR AllRegs[80]; + + /* Save the environment */ + if (!Fast486FpuLoadEnvironment(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? FAST486_REG_DS : State->SegmentOverride, + ModRegRm.MemoryAddress, + OperandSize)) + { + /* Exception occurred */ + return; + } + + /* Load the registers */ + if (!Fast486ReadMemory(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? FAST486_REG_DS : State->SegmentOverride, + ModRegRm.MemoryAddress + (OperandSize + 1) * 14, + FALSE, + AllRegs, + sizeof(AllRegs))) + { + /* Exception occurred */ + return; + } + + for (i = 0; i < FAST486_NUM_FPU_REGS; i++) + { + State->FpuRegisters[i].Mantissa = *((PULONGLONG)&AllRegs[i * 10]); + State->FpuRegisters[i].Exponent = *((PUSHORT)&AllRegs[(i * 10) + sizeof(ULONGLONG)]) & 0x7FFF; + + if (*((PUSHORT)&AllRegs[(i * 10) + sizeof(ULONGLONG)]) & 0x8000) + { + State->FpuRegisters[i].Sign = TRUE; + } + else + { + State->FpuRegisters[i].Sign = FALSE; + } + } break; } @@ -1709,8 +1793,6 @@ { INT i; UCHAR AllRegs[80]; - - FPU_SAVE_LAST_INST(); /* Save the environment */ if (!Fast486FpuSaveEnvironment(State, @@ -1748,9 +1830,6 @@ /* FSTSW */ case 7: { - FPU_SAVE_LAST_INST(); - FPU_SAVE_LAST_OPERAND(); - Fast486WriteModrmWordOperands(State, &ModRegRm, FALSE, State->FpuStatus.Value); break; }

9 years, 10 months

[jimtabor] 66133: [NtUser] - Get flash window ready for use. Still more testing is needed. Missing shell support.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jan 31 22:41:34 2015 New Revision: 66133 URL: http://svn.reactos.org/svn/reactos?rev=66133&view=rev Log: [NtUser] - Get flash window ready for use. Still more testing is needed. Missing shell support. Modified: trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/painting.h trunk/reactos/win32ss/user/ntuser/timer.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Sat Jan 31 22:41:34 2015 @@ -942,23 +942,127 @@ FASTCALL IntFlashWindowEx(PWND pWnd, PFLASHWINFO pfwi) { - PPROPERTY pprop; - DWORD FlashState; - BOOL Ret = FALSE; - - pprop = IntGetProp(pWnd, AtomFlashWndState); - if (!pprop) - { - FlashState = pfwi->dwFlags; - IntSetProp(pWnd, AtomFlashWndState, (HANDLE) FlashState); - return TRUE; - } - - FlashState = (DWORD)pprop->Data; + PFLASHDATA pfData; + BOOL Activate = FALSE, Ret = FALSE; + + pfData = UserGetProp(pWnd, AtomFlashWndState); + if (!pfData) + { + pfData = ExAllocatePoolWithTag(NonPagedPool, sizeof(FLASHDATA), USERTAG_WINDOW); + + pfData->FlashState = 0; + pfData->uCount = pfwi->uCount; + + IntSetProp(pWnd, AtomFlashWndState, (HANDLE) pfData); + } + + if (pfData->FlashState == FLASHW_FINISHED) + { + // Cycle has finished, kill timer and set this to Stop. + pfData->FlashState |= FLASHW_KILLSYSTIMER; + pfwi->dwFlags = FLASHW_STOP; + } + else + { + if (pfData->FlashState) + { + if (pfwi->dwFlags == FLASHW_SYSTIMER) + { + // Called from system timer, restore flags. + pfwi->dwFlags = pfData->FlashState; + } + } + else + { // First time in cycle, setup flash state. + if ( pWnd->state & WNDS_ACTIVEFRAME || + (pfwi->dwFlags & FLASHW_CAPTION && pWnd->style & (WS_BORDER|WS_DLGFRAME))) + { + pfData->FlashState = FLASHW_STARTED|FLASHW_ACTIVE; + } + } + + // Set previous window state. + Ret = !!(pfData->FlashState & FLASHW_ACTIVE); + + if ( pfwi->dwFlags & FLASHW_TIMERNOFG && + gpqForeground == pWnd->head.pti->MessageQueue ) + { + // Flashing until foreground, set this to Stop. + pfwi->dwFlags = FLASHW_STOP; + } + } + + // Toggle activate flag. if ( pfwi->dwFlags == FLASHW_STOP ) { + if (gpqForeground && gpqForeground->spwndActive == pWnd) + Activate = TRUE; + else + Activate = FALSE; + } + else + { + Activate = (pfData->FlashState & FLASHW_ACTIVE) == 0; + } + + if ( pfwi->dwFlags == FLASHW_STOP || pfwi->dwFlags & FLASHW_CAPTION ) + { + co_IntSendMessage(UserHMGetHandle(pWnd), WM_NCACTIVATE, Activate, 0); + } + + // FIXME: Check for a Stop Sign here. + if ( pfwi->dwFlags & FLASHW_TRAY ) + { + // Need some shell work here too. + TRACE("FIXME: Flash window no Tray support!\n"); + } + + if ( pfwi->dwFlags == FLASHW_STOP ) + { + if (pfData->FlashState & FLASHW_KILLSYSTIMER) + { + IntKillTimer(pWnd, ID_EVENT_SYSTIMER_FLASHWIN, TRUE); + } + IntRemoveProp(pWnd, AtomFlashWndState); - Ret = TRUE; + + ExFreePoolWithTag(pfData, USERTAG_WINDOW); + } + else + { // Have a count and started, set timer. + if ( pfData->uCount ) + { + pfData->FlashState |= FLASHW_COUNT; + + if (!(Activate ^ !!(pfData->FlashState & FLASHW_STARTED))) + pfData->uCount--; + + if (!(pfData->FlashState & FLASHW_KILLSYSTIMER)) + pfwi->dwFlags |= FLASHW_TIMER; + } + + if (pfwi->dwFlags & FLASHW_TIMER) + { + pfData->FlashState |= FLASHW_KILLSYSTIMER; + + IntSetTimer( pWnd, + ID_EVENT_SYSTIMER_FLASHWIN, + pfwi->dwTimeout ? pfwi->dwTimeout : gpsi->dtCaretBlink, + SystemTimerProc, + TMRF_SYSTEM ); + } + + if (pfData->FlashState & FLASHW_COUNT && pfData->uCount == 0) + { + // Keep spinning? Nothing else to do. + pfData->FlashState = FLASHW_FINISHED; + } + else + { + // Save state and flags so this can be restored next time through. + pfData->FlashState ^= (pfData->FlashState ^ -!!(Activate)) & FLASHW_ACTIVE; + pfData->FlashState ^= (pfData->FlashState ^ pfwi->dwFlags) & (FLASHW_MASK & ~FLASHW_TIMER); + } } return Ret; } Modified: trunk/reactos/win32ss/user/ntuser/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] Sat Jan 31 22:41:34 2015 @@ -1,4 +1,17 @@ #pragma once + +#define FLASHW_MASK 0x0000000f +#define FLASHW_SYSTIMER 0x00000400 +#define FLASHW_FINISHED 0x00000800 +#define FLASHW_STARTED 0x00001000 +#define FLASHW_COUNT 0x00002000 +#define FLASHW_KILLSYSTIMER 0x00004000 +#define FLASHW_ACTIVE 0x00008000 + +typedef struct _FLASHDATA{ + DWORD FlashState; + UINT uCount; +} FLASHDATA, *PFLASHDATA; BOOL FASTCALL co_UserRedrawWindow(PWND Wnd, const RECTL* UpdateRect, PREGION UpdateRgn, ULONG Flags); VOID FASTCALL IntInvalidateWindows(PWND Window, PREGION Rgn, ULONG Flags); @@ -11,3 +24,4 @@ BOOL FASTCALL IntEndPaint(PWND,PPAINTSTRUCT); HDC FASTCALL IntBeginPaint(PWND,PPAINTSTRUCT); PCURICON_OBJECT FASTCALL NC_IconForWindow( PWND ); +BOOL FASTCALL IntFlashWindowEx(PWND,PFLASHWINFO); Modified: trunk/reactos/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/timer.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] Sat Jan 31 22:41:34 2015 @@ -344,6 +344,17 @@ } } return; // Not this window so just return. + + case ID_EVENT_SYSTIMER_FLASHWIN: + { + FLASHWINFO fwi = + {sizeof(FLASHWINFO), + UserHMGetHandle(pWnd), + FLASHW_SYSTIMER,0,0}; + + IntFlashWindowEx(pWnd, &fwi); + } + return; default: ERR("System Timer Proc invalid id %u!\n", idEvent);

9 years, 10 months

[jimtabor] 66132: [NtUser] - Hack fix crash while removing menus. See CORE-9107 for crash information and CORE-8299 for overall menu issues.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jan 31 21:44:26 2015 New Revision: 66132 URL: http://svn.reactos.org/svn/reactos?rev=66132&view=rev Log: [NtUser] - Hack fix crash while removing menus. See CORE-9107 for crash information and CORE-8299 for overall menu issues. Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Sat Jan 31 21:44:26 2015 @@ -252,6 +252,11 @@ } } } + if (UserObjectInDestroy(Menu->head.h)) + { + ERR("Menu already dead!\n"); + return FALSE; + } ret = UserDeleteObject(Menu->head.h, TYPE_MENU); if (!ret) { // Make sure it is really dead or just marked for deletion.

9 years, 10 months

[aandrejevic] 66131: [FAST486] Implement FSTENV and FSAVE. Keep track of the last FPU instruction and operand.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Jan 31 21:34:56 2015 New Revision: 66131 URL: http://svn.reactos.org/svn/reactos?rev=66131&view=rev Log: [FAST486] Implement FSTENV and FSAVE. Keep track of the last FPU instruction and operand. Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h trunk/reactos/lib/fast486/fpu.c trunk/reactos/lib/fast486/fpu.h Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fast4… ============================================================================== --- trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] Sat Jan 31 21:34:56 2015 @@ -508,6 +508,10 @@ FAST486_FPU_STATUS_REG FpuStatus; FAST486_FPU_CONTROL_REG FpuControl; USHORT FpuTag; + FAST486_REG FpuLastInstPtr; + USHORT FpuLastCodeSel; + FAST486_REG FpuLastOpPtr; + USHORT FpuLastDataSel; #endif }; Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6613… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sat Jan 31 21:34:56 2015 @@ -919,6 +919,43 @@ } } +static inline BOOLEAN FASTCALL +Fast486FpuSaveEnvironment(PFAST486_STATE State, + INT Segment, + ULONG Address, + BOOLEAN Size) +{ + UCHAR Buffer[28]; + + /* Check if this is a 32-bit save or a 16-bit save */ + if (Size) + { + PULONG Data = (PULONG)Buffer; + + Data[0] = (ULONG)State->FpuControl.Value; + Data[1] = (ULONG)State->FpuStatus.Value; + Data[2] = (ULONG)State->FpuTag; + Data[3] = State->FpuLastInstPtr.Long; + Data[4] = (ULONG)State->FpuLastCodeSel; + Data[5] = State->FpuLastOpPtr.Long; + Data[6] = (ULONG)State->FpuLastDataSel; + } + else + { + PUSHORT Data = (PUSHORT)Buffer; + + Data[0] = State->FpuControl.Value; + Data[1] = State->FpuStatus.Value; + Data[2] = State->FpuTag; + Data[3] = State->FpuLastInstPtr.LowWord; + Data[4] = State->FpuLastCodeSel; + Data[5] = State->FpuLastOpPtr.LowWord; + Data[6] = State->FpuLastDataSel; + } + + return Fast486WriteMemory(State, Segment, Address, Buffer, (Size + 1) * 14); +} + #endif /* PUBLIC FUNCTIONS ***********************************************************/ @@ -930,6 +967,8 @@ PFAST486_FPU_DATA_REG SourceOperand, DestOperand; FAST486_FPU_DATA_REG MemoryData; + TOGGLE_ADSIZE(AddressSize); + /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) { @@ -940,6 +979,8 @@ FPU_CHECK(); #ifndef FAST486_NO_FPU + + FPU_SAVE_LAST_INST(); /* The destination operand is ST0 */ DestOperand = &FPU_ST(0); @@ -976,6 +1017,8 @@ Fast486FpuFromSingleReal(State, Value, &MemoryData); SourceOperand = &MemoryData; + + FPU_SAVE_LAST_OPERAND(); } else { @@ -1008,12 +1051,14 @@ #endif } -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDC) +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD9) { FAST486_MOD_REG_RM ModRegRm; - BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; - PFAST486_FPU_DATA_REG SourceOperand, DestOperand; - FAST486_FPU_DATA_REG MemoryData; + BOOLEAN OperandSize, AddressSize; + + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + TOGGLE_OPSIZE(OperandSize); + TOGGLE_ADSIZE(AddressSize); /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) @@ -1028,100 +1073,6 @@ if (ModRegRm.Memory) { - ULONGLONG Value; - - /* The destination operand is ST0 */ - DestOperand = &FPU_ST(0); - - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) - { - /* Raise the invalid operation exception */ - State->FpuStatus.Ie = TRUE; - - if (State->FpuControl.Im) - { - /* Return the indefinite NaN */ - DestOperand->Sign = TRUE; - DestOperand->Exponent = FPU_MAX_EXPONENT + 1; - DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; - - FPU_SET_TAG(0, FPU_TAG_SPECIAL); - } - else Fast486FpuException(State); - - return; - } - - /* Load the source operand from memory */ - if (!Fast486ReadMemory(State, - (State->PrefixFlags & FAST486_PREFIX_SEG) - ? State->SegmentOverride : FAST486_REG_DS, - ModRegRm.MemoryAddress, - FALSE, - &Value, - sizeof(ULONGLONG))) - { - /* Exception occurred */ - return; - } - - Fast486FpuFromDoubleReal(State, Value, &MemoryData); - SourceOperand = &MemoryData; - } - else - { - /* The source operand is ST0 */ - SourceOperand = &FPU_ST(0); - - /* Load the destination operand from an FPU register */ - DestOperand = &FPU_ST(ModRegRm.SecondRegister); - - if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) - || (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY)) - { - /* Raise the invalid operation exception */ - State->FpuStatus.Ie = TRUE; - - if (State->FpuControl.Im) - { - /* Return the indefinite NaN */ - DestOperand->Sign = TRUE; - DestOperand->Exponent = FPU_MAX_EXPONENT + 1; - DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; - - FPU_SET_TAG(ModRegRm.SecondRegister, FPU_TAG_SPECIAL); - } - else Fast486FpuException(State); - - return; - } - } - - /* Perform the requested operation */ - Fast486FpuArithmeticOperation(State, ModRegRm.Register, SourceOperand, DestOperand); - -#endif -} - - -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD9) -{ - FAST486_MOD_REG_RM ModRegRm; - BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; - - /* Get the operands */ - if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) - { - /* Exception occurred */ - return; - } - - FPU_CHECK(); - -#ifndef FAST486_NO_FPU - - if (ModRegRm.Memory) - { switch (ModRegRm.Register) { /* FLD */ @@ -1129,6 +1080,9 @@ { ULONG Value; FAST486_FPU_DATA_REG MemoryData; + + FPU_SAVE_LAST_INST(); + FPU_SAVE_LAST_OPERAND(); if (!Fast486ReadModrmDwordOperands(State, &ModRegRm, NULL, &Value)) { @@ -1148,6 +1102,9 @@ case 3: { ULONG Value = FPU_REAL4_INDEFINITE; + + FPU_SAVE_LAST_INST(); + FPU_SAVE_LAST_OPERAND(); if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { @@ -1195,9 +1152,11 @@ /* FSTENV */ case 6: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - + Fast486FpuSaveEnvironment(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? FAST486_REG_DS : State->SegmentOverride, + ModRegRm.MemoryAddress, + OperandSize); break; } @@ -1233,6 +1192,8 @@ LONG Value; FAST486_FPU_DATA_REG MemoryData; + TOGGLE_ADSIZE(AddressSize); + /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) { @@ -1243,6 +1204,8 @@ FPU_CHECK(); #ifndef FAST486_NO_FPU + + FPU_SAVE_LAST_INST(); if (!ModRegRm.Memory) { @@ -1271,6 +1234,8 @@ return; } + + FPU_SAVE_LAST_OPERAND(); /* Load the source operand from memory */ if (!Fast486ReadModrmDwordOperands(State, &ModRegRm, NULL, (PULONG)&Value)) @@ -1315,6 +1280,8 @@ FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + TOGGLE_ADSIZE(AddressSize); + /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) { @@ -1328,6 +1295,9 @@ if (ModRegRm.Memory) { + FPU_SAVE_LAST_INST(); + FPU_SAVE_LAST_OPERAND(); + switch (ModRegRm.Register) { /* FILD */ @@ -1531,10 +1501,14 @@ #endif } -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDD) +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDC) { FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + PFAST486_FPU_DATA_REG SourceOperand, DestOperand; + FAST486_FPU_DATA_REG MemoryData; + + TOGGLE_ADSIZE(AddressSize); /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) @@ -1547,6 +1521,107 @@ #ifndef FAST486_NO_FPU + FPU_SAVE_LAST_INST(); + + if (ModRegRm.Memory) + { + ULONGLONG Value; + + /* The destination operand is ST0 */ + DestOperand = &FPU_ST(0); + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + + if (State->FpuControl.Im) + { + /* Return the indefinite NaN */ + DestOperand->Sign = TRUE; + DestOperand->Exponent = FPU_MAX_EXPONENT + 1; + DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + + FPU_SET_TAG(0, FPU_TAG_SPECIAL); + } + else Fast486FpuException(State); + + return; + } + + /* Load the source operand from memory */ + if (!Fast486ReadMemory(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? State->SegmentOverride : FAST486_REG_DS, + ModRegRm.MemoryAddress, + FALSE, + &Value, + sizeof(ULONGLONG))) + { + /* Exception occurred */ + return; + } + + Fast486FpuFromDoubleReal(State, Value, &MemoryData); + SourceOperand = &MemoryData; + + FPU_SAVE_LAST_OPERAND(); + } + else + { + /* The source operand is ST0 */ + SourceOperand = &FPU_ST(0); + + /* Load the destination operand from an FPU register */ + DestOperand = &FPU_ST(ModRegRm.SecondRegister); + + if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) + || (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY)) + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + + if (State->FpuControl.Im) + { + /* Return the indefinite NaN */ + DestOperand->Sign = TRUE; + DestOperand->Exponent = FPU_MAX_EXPONENT + 1; + DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + + FPU_SET_TAG(ModRegRm.SecondRegister, FPU_TAG_SPECIAL); + } + else Fast486FpuException(State); + + return; + } + } + + /* Perform the requested operation */ + Fast486FpuArithmeticOperation(State, ModRegRm.Register, SourceOperand, DestOperand); + +#endif +} + +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDD) +{ + FAST486_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + TOGGLE_OPSIZE(OperandSize); + TOGGLE_ADSIZE(AddressSize); + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return; + } + + FPU_CHECK(); + +#ifndef FAST486_NO_FPU + if (ModRegRm.Memory) { switch (ModRegRm.Register) @@ -1556,6 +1631,9 @@ { ULONGLONG Value; FAST486_FPU_DATA_REG MemoryData; + + FPU_SAVE_LAST_INST(); + FPU_SAVE_LAST_OPERAND(); if (!Fast486ReadMemory(State, (State->PrefixFlags & FAST486_PREFIX_SEG) @@ -1582,6 +1660,9 @@ { ULONGLONG Value = FPU_REAL8_INDEFINITE; + FPU_SAVE_LAST_INST(); + FPU_SAVE_LAST_OPERAND(); + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { /* Raise the invalid operation exception */ @@ -1626,8 +1707,40 @@ /* FSAVE */ case 6: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + INT i; + UCHAR AllRegs[80]; + + FPU_SAVE_LAST_INST(); + + /* Save the environment */ + if (!Fast486FpuSaveEnvironment(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? FAST486_REG_DS : State->SegmentOverride, + ModRegRm.MemoryAddress, + OperandSize)) + { + /* Exception occurred */ + return; + } + + /* Save the registers */ + for (i = 0; i < FAST486_NUM_FPU_REGS; i++) + { + *((PULONGLONG)&AllRegs[i * 10]) = State->FpuRegisters[i].Mantissa; + *((PUSHORT)&AllRegs[(i * 10) + sizeof(ULONGLONG)]) = State->FpuRegisters[i].Exponent; + + if (State->FpuRegisters[i].Sign) + { + *((PUSHORT)&AllRegs[(i * 10) + sizeof(ULONGLONG)]) |= 0x8000; + } + } + + Fast486WriteMemory(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? FAST486_REG_DS : State->SegmentOverride, + ModRegRm.MemoryAddress + (OperandSize + 1) * 14, + AllRegs, + sizeof(AllRegs)); break; } @@ -1635,6 +1748,9 @@ /* FSTSW */ case 7: { + FPU_SAVE_LAST_INST(); + FPU_SAVE_LAST_OPERAND(); + Fast486WriteModrmWordOperands(State, &ModRegRm, FALSE, State->FpuStatus.Value); break; } @@ -1648,6 +1764,8 @@ } else { + FPU_SAVE_LAST_INST(); + switch (ModRegRm.Register) { /* FFREE */ @@ -1731,6 +1849,8 @@ BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; PFAST486_FPU_DATA_REG SourceOperand, DestOperand; + TOGGLE_ADSIZE(AddressSize); + /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) { @@ -1741,6 +1861,8 @@ FPU_CHECK(); #ifndef FAST486_NO_FPU + + FPU_SAVE_LAST_INST(); if (ModRegRm.Memory) { @@ -1778,6 +1900,8 @@ Fast486FpuFromInteger(State, (LONGLONG)Value, &MemoryData); SourceOperand = &MemoryData; + + FPU_SAVE_LAST_OPERAND(); } else { @@ -1818,6 +1942,8 @@ FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + TOGGLE_ADSIZE(AddressSize); + /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) { @@ -1829,8 +1955,12 @@ #ifndef FAST486_NO_FPU + FPU_SAVE_LAST_INST(); + if (ModRegRm.Memory) { + FPU_SAVE_LAST_OPERAND(); + switch (ModRegRm.Register) { /* FILD */ Modified: trunk/reactos/lib/fast486/fpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.h?rev=6613… ============================================================================== --- trunk/reactos/lib/fast486/fpu.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.h [iso-8859-1] Sat Jan 31 21:34:56 2015 @@ -42,6 +42,15 @@ State->FpuTag |= ((t) & 3) << (FPU_INDEX(i) * 2); \ } #define FPU_UPDATE_TAG(i) FPU_SET_TAG((i), Fast486FpuGetValueTag(&FPU_ST(i))) +#define FPU_SAVE_LAST_INST() { \ + State->FpuLastInstPtr = State->SavedInstPtr; \ + State->FpuLastCodeSel = State->SegmentRegs[FAST486_REG_CS].Selector; \ + } +#define FPU_SAVE_LAST_OPERAND() { \ + State->FpuLastOpPtr.Long = ModRegRm.MemoryAddress; \ + State->FpuLastDataSel = (State->PrefixFlags & FAST486_PREFIX_SEG) \ + ? State->SegmentOverride : FAST486_REG_DS; \ + } #define FPU_REAL4_BIAS 0x7F #define FPU_REAL8_BIAS 0x3FF

9 years, 10 months

[hbelusca] 66130: Code style changes only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 31 19:05:15 2015 New Revision: 66130 URL: http://svn.reactos.org/svn/reactos?rev=66130&view=rev Log: Code style changes only. Modified: trunk/reactos/tools/cdmake/cdmake.c Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Sat Jan 31 19:05:15 2015 @@ -239,7 +239,7 @@ error exit point in main(). -----------------------------------------------------------------------------*/ -void error_exit( const char* fmt, ... ) +void error_exit(const char* fmt, ...) { va_list arg; @@ -459,11 +459,11 @@ identifier_size = 1; break; case SUBDIRECTORY_RECORD: - /*printf( "Subdir: %s\n", d->name_on_cd );*/ + /*printf("Subdir: %s\n", d->name_on_cd);*/ identifier_size = strlen(d->name_on_cd); break; case FILE_RECORD: - /*printf( "File: %s.%s -> %s.%s\n", d->name, d->extension, d->name_on_cd, d->extension_on_cd );*/ + /*printf("File: %s.%s -> %s.%s\n", d->name, d->extension, d->name_on_cd, d->extension_on_cd);*/ identifier_size = strlen(d->name_on_cd) + 2; if (d->extension_on_cd[0] != 0) identifier_size += 1 + strlen(d->extension_on_cd); @@ -578,21 +578,21 @@ This function checks to see if there's a cdname conflict. -----------------------------------------------------------------------------*/ -int cdname_exists( PDIR_RECORD d ) +int cdname_exists(PDIR_RECORD d) { PDIR_RECORD p = d->parent->first_record; - while ( p ) + while (p) { if ( p != d - && !strcasecmp( p->name_on_cd, d->name_on_cd ) - && !strcasecmp( p->extension_on_cd, d->extension_on_cd ) ) + && !strcasecmp(p->name_on_cd, d->name_on_cd) + && !strcasecmp(p->extension_on_cd, d->extension_on_cd) ) return 1; p = p->next_in_directory; } return 0; } -void parse_filename_into_dirrecord( const char* filename, PDIR_RECORD d, BOOL dir ) +void parse_filename_into_dirrecord(const char* filename, PDIR_RECORD d, BOOL dir) { const char *s = filename; char *t = d->name_on_cd; @@ -608,35 +608,35 @@ break; } - if ( (size_t)(t-d->name_on_cd) < sizeof(d->name_on_cd)-1 ) + if ((size_t)(t-d->name_on_cd) < sizeof(d->name_on_cd)-1) *t++ = check_for_punctuation(*s, filename); else if (!joliet) - error_exit("'%s' is not ISO-9660, aborting...", filename ); - if ( (size_t)(n-d->name) < sizeof(d->name)-1 ) + error_exit("'%s' is not ISO-9660, aborting...", filename); + if ((size_t)(n-d->name) < sizeof(d->name)-1) *n++ = *s; else if (!joliet) - error_exit( "'%s' is not ISO-9660, aborting...", filename ); + error_exit("'%s' is not ISO-9660, aborting...", filename); s++; } if (strlen(s) > MAX_EXTENSION_LENGTH) { - error_exit( "'%s' has too long extension for cdmake, aborting...", filename ); + error_exit("'%s' has too long extension, aborting...", filename); } *t = 0; strcpy(d->extension, s); t = d->extension_on_cd; - while ( *s != 0 ) - { - if ( (size_t)(t-d->extension_on_cd) < sizeof(d->extension_on_cd)-1 ) + while (*s != 0) + { + if ((size_t)(t-d->extension_on_cd) < sizeof(d->extension_on_cd)-1) *t++ = check_for_punctuation(*s, filename); else if (!joliet) - error_exit( "'%s' is not ISO-9660, aborting...", filename ); + error_exit("'%s' is not ISO-9660, aborting...", filename); s++; } *t = 0; *n = 0; - if ( dir ) + if (dir) { if (d->extension[0] != 0) { @@ -650,28 +650,28 @@ } filename_counter = 1; - while ( cdname_exists( d ) ) + while (cdname_exists(d)) { // the file name must be least 8 char long if (strlen(d->name_on_cd)<8) - error_exit( "'%s' is a duplicate file name, aborting...", filename ); + error_exit("'%s' is a duplicate file name, aborting...", filename); if ((d->name_on_cd[8] == '.') && (strlen(d->name_on_cd) < 13)) - error_exit( "'%s' is a duplicate file name, aborting...", filename ); + error_exit("'%s' is a duplicate file name, aborting...", filename); // max 255 times for equal short filename - if (filename_counter>255) error_exit( "'%s' is a duplicate file name, aborting...", filename ); + if (filename_counter>255) error_exit("'%s' is a duplicate file name, aborting...", filename); d->name_on_cd[8] = '~'; memset(&d->name_on_cd[9],0,5); sprintf(&d->name_on_cd[9],"%d",filename_counter); filename_counter++; } - if ( joliet ) + if (joliet) { joliet_length = strlen(filename); if (joliet_length > 64) - error_exit( "'%s' is not Joliet, aborting...", filename ); + error_exit("'%s' is not Joliet, aborting...", filename); d->joliet_name = malloc(joliet_length + 1); if (d->joliet_name == NULL) error_exit("Insufficient memory"); @@ -703,7 +703,7 @@ /* I need the parent set before calling parse_filename_into_dirrecord(), because that functions checks for duplicate file names*/ d->parent = parent; - parse_filename_into_dirrecord( f->name, d, f->attrib & _A_SUBDIR ); + parse_filename_into_dirrecord(f->name, d, f->attrib & _A_SUBDIR); convert_date_and_time(&d->date_and_time, &f->time_write); d->flags |= f->attrib & _A_HIDDEN ? HIDDEN_FLAG : 0; @@ -738,9 +738,9 @@ because that functions checks for duplicate file names*/ d->parent = parent; #ifdef HAVE_D_TYPE - parse_filename_into_dirrecord( entry->d_name, d, entry->d_type == DT_DIR ); + parse_filename_into_dirrecord(entry->d_name, d, entry->d_type == DT_DIR); #else - parse_filename_into_dirrecord( entry->d_name, d, S_ISDIR(stbuf->st_mode) ); + parse_filename_into_dirrecord(entry->d_name, d, S_ISDIR(stbuf->st_mode)); #endif convert_date_and_time(&d->date_and_time, &stbuf->st_mtime);

9 years, 10 months

[hbelusca] 66129: No code clarification, sorry.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 31 18:56:14 2015 New Revision: 66129 URL: http://svn.reactos.org/svn/reactos?rev=66129&view=rev Log: No code clarification, sorry. Modified: trunk/reactos/tools/cdmake/cdmake.c Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Sat Jan 31 18:56:14 2015 @@ -1838,14 +1838,10 @@ { char *trimmedline, *targetname, *srcname, *eq; char lineread[1024]; - FILE *f; - - source++; - - f = fopen(source, "r"); + FILE *f = fopen(source+1, "r"); if (!f) { - error_exit("Can't open cd description %s\n", source); + error_exit("Can't open cd description %s\n", source+1); } while (fgets(lineread, sizeof(lineread), f)) {

9 years, 10 months

[hbelusca] 66128: [CDMAKE]: Fix Philip's firstname; clarify code.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 31 18:54:52 2015 New Revision: 66128 URL: http://svn.reactos.org/svn/reactos?rev=66128&view=rev Log: [CDMAKE]: Fix Philip's firstname; clarify code. Modified: trunk/reactos/tools/cdmake/cdmake.c trunk/reactos/tools/cdmake/llmsort.c Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Sat Jan 31 18:54:52 2015 @@ -34,7 +34,7 @@ * magnus(a)greatlord.com */ -/* According to his website, this file was released into the public domain by Phillip J. Erdelsky */ +/* According to his website, this file was released into the public domain by Philip J. Erdelsky */ #include <stdio.h> #include <fcntl.h> @@ -1838,10 +1838,14 @@ { char *trimmedline, *targetname, *srcname, *eq; char lineread[1024]; - FILE *f = fopen(source+1, "r"); + FILE *f; + + source++; + + f = fopen(source, "r"); if (!f) { - error_exit("Can't open cd description %s\n", source+1); + error_exit("Can't open cd description %s\n", source); } while (fgets(lineread, sizeof(lineread), f)) { Modified: trunk/reactos/tools/cdmake/llmsort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/llmsort.c?rev… ============================================================================== --- trunk/reactos/tools/cdmake/llmsort.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/llmsort.c [iso-8859-1] Sat Jan 31 18:54:52 2015 @@ -5,8 +5,7 @@ * http://alumnus.caltech.edu/~pje/ */ -/* According to his website, this file was released into the public domain by Phillip J. Erdelsky */ - +/* According to his website, this file was released into the public domain by Philip J. Erdelsky */ #include <stdio.h>

9 years, 10 months

[hbelusca] 66127: [CDMAKE]: Have fun with cdmake: - Fix copyright headers - Fix string identifiers for ISO9660 and Joliet

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 31 18:44:28 2015 New Revision: 66127 URL: http://svn.reactos.org/svn/reactos?rev=66127&view=rev Log: [CDMAKE]: Have fun with cdmake: - Fix copyright headers - Fix string identifiers for ISO9660 and Joliet Added: trunk/reactos/tools/cdmake/config.h (with props) Removed: trunk/reactos/tools/cdmake/dirsep.h Modified: trunk/reactos/tools/cdmake/cdmake.c trunk/reactos/tools/cdmake/dirhash.c trunk/reactos/tools/cdmake/llmsort.c Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Sat Jan 31 18:44:28 2015 @@ -2,7 +2,19 @@ * CD-ROM Maker * by Philip J. Erdelsky * pje(a)acm.org - * http://www.alumni.caltech.edu/~pje/ + * http://alumnus.caltech.edu/~pje/ + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CD-ROM Maker + * FILE: tools/cdmake/cdmake.c + * PURPOSE: CD-ROM Premastering Utility + * PROGRAMMERS: Eric Kohl + * Casper S. Hornstrup + * Filip Navara + * Magnus Olsen + * + * HISTORY: * * ElTorito-Support * by Eric Kohl @@ -18,10 +30,8 @@ * - No Joliet file name validations * - Very bad ISO file name generation * - * - * convert long filename to iso9660 file name by Magnus Olsen + * Convert long filename to ISO9660 file name by Magnus Olsen * magnus(a)greatlord.com - * */ /* According to his website, this file was released into the public domain by Phillip J. Erdelsky */ @@ -56,7 +66,7 @@ #include <ctype.h> #include <setjmp.h> #include <time.h> -#include "dirsep.h" +#include "config.h" #include "dirhash.h" typedef unsigned char BYTE; @@ -349,6 +359,20 @@ write_byte(*s++); } +static void write_bytecounted_string(unsigned bytecount, char *s) +{ + while (*s != 0 && bytecount != 0) + { + write_byte(*s++); + bytecount--; + } + while (bytecount != 0) + { + write_byte(' '); + bytecount--; + } +} + /*----------------------------------------------------------------------------- This function writes a ansi string as a big endian unicode string to the CD-ROM image. The terminating \0 is not written. @@ -358,9 +382,27 @@ { while (*s != 0) { - write_byte(0); - write_byte(*s++); - } + write_big_endian_word(*s++); + } +} + +static void write_bytecounted_string_as_big_endian_unicode(unsigned bytecount, char *s) +{ + unsigned wordcount = bytecount / 2; + + while (*s != 0 && wordcount != 0) + { + write_big_endian_word(*s++); + wordcount--; + } + while (wordcount != 0) + { + write_big_endian_word(' '); + wordcount--; + } + + if (bytecount % 2 != 0) + write_byte(' '); } /*----------------------------------------------------------------------------- @@ -377,7 +419,7 @@ } /*----------------------------------------------------------------------------- -This function writes a block of identical bige endian words to the CD-ROM image. +This function writes a block of identical big endian words to the CD-ROM image. -----------------------------------------------------------------------------*/ static void write_word_block(unsigned count, WORD value) @@ -1264,8 +1306,6 @@ { PDIR_RECORD d; PDIR_RECORD q; - unsigned int i; - char *t; unsigned int index; unsigned int name_length; DWORD size; @@ -1285,11 +1325,8 @@ write_string("\1CD001\1"); write_byte(0); - write_block(32, ' '); // system identifier - - t = volume_label; - for (i = 0; i < 32; i++) - write_byte( (BYTE)( (*t != 0) ? toupper(*t++) : ' ' ) ); + write_bytecounted_string(32, ""); // system identifier + write_bytecounted_string(32, volume_label); // volume label write_block(8, 0); write_both_endian_dword(total_sectors); @@ -1303,13 +1340,16 @@ write_big_endian_dword(big_endian_path_table_sector); write_big_endian_dword((DWORD) 0); // second big endian path table write_directory_record(&root, DOT_RECORD, FALSE); - write_block(128, ' '); // volume set identifier - write_block(128, ' '); // publisher identifier - write_block(128, ' '); // data preparer identifier - write_block(128, ' '); // application identifier - write_block(37, ' '); // copyright file identifier - write_block(37, ' '); // abstract file identifier - write_block(37, ' '); // bibliographic file identifier + + write_bytecounted_string(128, volume_label); // volume set identifier + write_bytecounted_string(128, PUBLISHER_ID); // publisher identifier + write_bytecounted_string(128, DATA_PREP_ID); // data preparer identifier + write_bytecounted_string(128, APP_ID); // application identifier + + write_bytecounted_string(37, ""); // copyright file identifier + write_bytecounted_string(37, ""); // abstract file identifier + write_bytecounted_string(37, ""); // bibliographic file identifier + write_string(timestring); // volume creation write_byte(0); write_string(timestring); // most recent modification @@ -1342,12 +1382,8 @@ { write_string("\2CD001\1"); write_byte(0); - - write_word_block(16, L' '); // system identifier - - t = volume_label; - for (i = 0; i < 16; i++) - write_big_endian_word( (BYTE)( (*t != 0) ? *t++ : ' ' ) ); + write_bytecounted_string_as_big_endian_unicode(32, ""); // system identifier + write_bytecounted_string_as_big_endian_unicode(32, volume_label); // volume label write_block(8, 0); write_both_endian_dword(total_sectors); @@ -1362,13 +1398,16 @@ write_big_endian_dword(joliet_big_endian_path_table_sector); write_big_endian_dword((DWORD) 0); // second big endian path table write_directory_record(&root, DOT_RECORD, TRUE); - write_word_block(64, ' '); // volume set identifier - write_word_block(64, ' '); // publisher identifier - write_word_block(64, ' '); // data preparer identifier - write_word_block(64, ' '); // application identifier - write_block(37, ' '); // copyright file identifier - write_block(37, ' '); // abstract file identifier - write_block(37, ' '); // bibliographic file identifier + + write_bytecounted_string_as_big_endian_unicode(128, volume_label); // volume set identifier + write_bytecounted_string_as_big_endian_unicode(128, PUBLISHER_ID); // publisher identifier + write_bytecounted_string_as_big_endian_unicode(128, DATA_PREP_ID); // data preparer identifier + write_bytecounted_string_as_big_endian_unicode(128, APP_ID); // application identifier + + write_bytecounted_string_as_big_endian_unicode(37, ""); // copyright file identifier + write_bytecounted_string_as_big_endian_unicode(37, ""); // abstract file identifier + write_bytecounted_string_as_big_endian_unicode(37, ""); // bibliographic file identifier + write_string(timestring); // volume creation write_byte(0); write_string(timestring); // most recent modification @@ -1651,22 +1690,27 @@ } static char HELP[] = - "CDMAKE [-q] [-v] [-p] [-s N] [-m] [-b bootimage] [-j] source volume image\n" "\n" - " source specifications of base directory containing all files to\n" + "CDMAKE CD-ROM Premastering Utility\n" + "Copyright (C) Philip J. Erdelsky\n" + "Copyright (C) 2003-2015 ReactOS Team\n" + "\n\n" + "CDMAKE [-q] [-v] [-p] [-s N] [-m] [-b bootimage] [-j] source volume image\n" + "\n" + " source Specifications of base directory containing all files to\n" " be written to CD-ROM image\n" - " volume volume label\n" - " image image file or device\n" - " -q quiet mode - display nothing but error messages\n" - " -v verbose mode - display file information as files are\n" + " volume Volume label\n" + " image Image file or device\n" + " -q Quiet mode - display nothing but error messages\n" + " -v Verbose mode - display file information as files are\n" " scanned and written - overrides -p option\n" - " -p show progress while writing\n" - " -s N abort operation before beginning write if image will be\n" + " -p Show progress while writing\n" + " -s N Abort operation before beginning write if image will be\n" " larger than N megabytes (i.e. 1024*1024*N bytes)\n" - " -m accept punctuation marks other than underscores in\n" + " -m Accept punctuation marks other than underscores in\n" " names and extensions\n" - " -b bootimage create bootable ElTorito CD-ROM using 'no emulation' mode\n" - " -j generate Joliet filename records\n"; + " -b bootimage Create bootable ElTorito CD-ROM using 'no emulation' mode\n" + " -j Generate Joliet filename records\n"; /*----------------------------------------------------------------------------- Program execution starts here. Added: trunk/reactos/tools/cdmake/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/config.h?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/config.h (added) +++ trunk/reactos/tools/cdmake/config.h [iso-8859-1] Sat Jan 31 18:44:28 2015 @@ -0,0 +1,14 @@ +#ifndef _WIN32 +#ifndef MAX_PATH +#define MAX_PATH 260 +#endif +#define DIR_SEPARATOR_CHAR '/' +#define DIR_SEPARATOR_STRING "/" +#else +#define DIR_SEPARATOR_CHAR '\\' +#define DIR_SEPARATOR_STRING "\\" +#endif + +#define PUBLISHER_ID "ReactOS Foundation" +#define DATA_PREP_ID "ReactOS Foundation" +#define APP_ID "CDMAKE CD-ROM Premastering Utility" Propchange: trunk/reactos/tools/cdmake/config.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/tools/cdmake/dirhash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.c?rev… ============================================================================== --- trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] Sat Jan 31 18:44:28 2015 @@ -1,7 +1,7 @@ #include <string.h> #include <stdlib.h> #include <ctype.h> -#include "dirsep.h" +#include "config.h" #include "dirhash.h" /* This is the famous DJB hash */ Removed: trunk/reactos/tools/cdmake/dirsep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirsep.h?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/dirsep.h [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/dirsep.h (removed) @@ -1,10 +0,0 @@ -#ifndef _WIN32 -#ifndef MAX_PATH -#define MAX_PATH 260 -#endif -#define DIR_SEPARATOR_CHAR '/' -#define DIR_SEPARATOR_STRING "/" -#else -#define DIR_SEPARATOR_CHAR '\\' -#define DIR_SEPARATOR_STRING "\\" -#endif Modified: trunk/reactos/tools/cdmake/llmsort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/llmsort.c?rev… ============================================================================== --- trunk/reactos/tools/cdmake/llmsort.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/llmsort.c [iso-8859-1] Sat Jan 31 18:44:28 2015 @@ -1,8 +1,9 @@ -/* A Linked-List Memory Sort - by Philip J. Erdelsky - pje(a)acm.org - http://www.alumni.caltech.edu/~pje/ -*/ +/* + * A Linked-List Memory Sort + * by Philip J. Erdelsky + * pje(a)acm.org + * http://alumnus.caltech.edu/~pje/ + */ /* According to his website, this file was released into the public domain by Phillip J. Erdelsky */

9 years, 10 months

[aandrejevic] 66126: [FAST486] Implement FST/FSTP for single reals.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Jan 31 16:13:40 2015 New Revision: 66126 URL: http://svn.reactos.org/svn/reactos?rev=66126&view=rev Log: [FAST486] Implement FST/FSTP for single reals. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6612… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sat Jan 31 16:13:40 2015 @@ -270,6 +270,117 @@ } } +static inline BOOLEAN FASTCALL +Fast486FpuToSingleReal(PFAST486_STATE State, + PFAST486_FPU_DATA_REG Value, + PULONG Result) +{ + ULONGLONG Remainder; + SHORT UnbiasedExp = (SHORT)Value->Exponent - FPU_REAL10_BIAS; + + if (FPU_IS_ZERO(Value)) + { + *Result = 0; + return TRUE; + } + + /* Calculate the mantissa */ + *Result = (ULONG)(Value->Mantissa >> 40) & 0x7FFFFF; + + if (FPU_IS_NAN(Value)) + { + *Result |= FPU_REAL4_INFINITY; + goto SetSign; + } + + /* Check for underflow */ + if (!FPU_IS_NORMALIZED(Value) || (UnbiasedExp < -127)) + { + /* Raise the underflow exception */ + State->FpuStatus.Ue = TRUE; + + if (State->FpuControl.Um) + { + /* The result is zero due to underflow */ + *Result = 0ULL; + return TRUE; + } + else + { + Fast486FpuException(State); + return FALSE; + } + } + + /* Check for overflow */ + if (UnbiasedExp > 127) + { + /* Raise the overflow exception */ + State->FpuStatus.Oe = TRUE; + + if (State->FpuControl.Om) + { + /* The result is infinity due to overflow */ + *Result = FPU_REAL4_INFINITY; + goto SetSign; + } + else + { + Fast486FpuException(State); + return FALSE; + } + } + + /* Calculate the remainder */ + Remainder = Value->Mantissa & ((1ULL << 40) - 1); + + switch (State->FpuControl.Rc) + { + case FPU_ROUND_NEAREST: + { + /* Check if the highest bit of the remainder is set */ + if (Remainder & (1ULL << 39)) + { + (*Result)++; + + /* Check if all the other bits are clear */ + if (!(Remainder & ((1ULL << 39) - 1))) + { + /* Round to even */ + *Result &= ~1; + } + } + + break; + } + + case FPU_ROUND_DOWN: + { + if ((Remainder != 0ULL) && Value->Sign) (*Result)++; + break; + } + + case FPU_ROUND_UP: + { + if ((Remainder != 0ULL) && !Value->Sign) (*Result)++; + break; + } + + default: + { + /* Leave it truncated */ + } + } + + /* Store the biased exponent */ + *Result |= (ULONG)(UnbiasedExp + FPU_REAL4_BIAS) << 23; + +SetSign: + + if (Value->Sign) *Result |= 0x80000000; + return TRUE; +} + static inline VOID FASTCALL Fast486FpuFromDoubleReal(PFAST486_STATE State, ULONGLONG Value, @@ -310,7 +421,7 @@ if (FPU_IS_NAN(Value)) { - *Result |= 0x7FFULL << 52; + *Result |= FPU_REAL8_INFINITY; goto SetSign; } @@ -1036,9 +1147,32 @@ /* FSTP */ case 3: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - + ULONG Value = FPU_REAL4_INDEFINITE; + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + + if (!State->FpuControl.Im) + { + Fast486FpuException(State); + return; + } + } + else if (!Fast486FpuToSingleReal(State, &FPU_ST(0), &Value)) + { + /* Exception occurred */ + return; + } + + if (!Fast486WriteModrmDwordOperands(State, &ModRegRm, FALSE, Value)) + { + /* Exception occurred */ + return; + } + + if (ModRegRm.Register == 3) Fast486FpuPop(State); break; }

9 years, 10 months

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 January 2015