#include <freeldr.h>
-#define NDEBUG
#include <debug.h>
typedef struct _FRAME
void *Address;
} FRAME;
-char *i386ExceptionDescriptionText[] =
+static const CHAR *i386ExceptionDescriptionText[] =
{
"Exception 00: DIVIDE BY ZERO\n\n",
"Exception 01: DEBUG EXCEPTION\n\n",
"Exception 12: MACHINE CHECK\n\n"
};
-#define SCREEN_ATTR 0x1f
-void
-i386PrintChar(char chr, ULONG x, ULONG y)
+#define SCREEN_ATTR 0x1F // Bright white on blue background
+
+/* Used to store the current X and Y position on the screen */
+static ULONG i386_ScreenPosX = 0;
+static ULONG i386_ScreenPosY = 0;
+
+#if 0
+static void
+i386PrintChar(CHAR chr, ULONG x, ULONG y)
{
MachVideoPutChar(chr, SCREEN_ATTR, x, y);
}
+#endif
-/* Used to store the current X and Y position on the screen */
-ULONG i386_ScreenPosX = 0;
-ULONG i386_ScreenPosY = 0;
-
-void
-i386PrintText(char *pszText)
+static void
+i386PrintText(CHAR *pszText)
{
- char chr;
- while (1)
- {
- chr = *pszText++;
+ ULONG Width, Unused;
+
+ MachVideoGetDisplaySize(&Width, &Unused, &Unused);
- if (chr == 0) break;
- if (chr == '\n')
+ for (; *pszText != ANSI_NULL; ++pszText)
+ {
+ if (*pszText == '\n')
{
- i386_ScreenPosY++;
i386_ScreenPosX = 0;
+ ++i386_ScreenPosY;
continue;
}
- MachVideoPutChar(chr, SCREEN_ATTR, i386_ScreenPosX, i386_ScreenPosY);
- i386_ScreenPosX++;
+ MachVideoPutChar(*pszText, SCREEN_ATTR, i386_ScreenPosX, i386_ScreenPosY);
+ if (++i386_ScreenPosX >= Width)
+ {
+ i386_ScreenPosX = 0;
+ ++i386_ScreenPosY;
+ }
+ // FIXME: Implement vertical screen scrolling if we are at the end of the screen.
}
}
-void
-PrintText(const char *format, ...)
+static void
+PrintTextV(const CHAR *Format, va_list args)
+{
+ CHAR Buffer[512];
+
+ _vsnprintf(Buffer, sizeof(Buffer), Format, args);
+ Buffer[sizeof(Buffer) - 1] = ANSI_NULL;
+
+ i386PrintText(Buffer);
+}
+
+static void
+PrintText(const CHAR *Format, ...)
{
va_list argptr;
- char buffer[256];
- va_start(argptr, format);
- _vsnprintf(buffer, sizeof(buffer), format, argptr);
- buffer[sizeof(buffer) - 1] = 0;
+ va_start(argptr, Format);
+ PrintTextV(Format, argptr);
va_end(argptr);
- i386PrintText(buffer);
}
-void
+static void
i386PrintFrames(PKTRAP_FRAME TrapFrame)
{
FRAME *Frame;
{
PUCHAR InstructionPointer;
+ MachVideoHideShowTextCursor(FALSE);
MachVideoClearScreen(SCREEN_ATTR);
i386_ScreenPosX = 0;
i386_ScreenPosY = 0;
PrintText("An error occured in " VERSION "\n"
- "Report this error to the ReactOS Development mailing list <ros-dev@reactos.org>\n\n"
+ "Report this error on the ReactOS Bug Tracker: https://jira.reactos.org\n\n"
"0x%02lx: %s\n", TrapIndex, i386ExceptionDescriptionText[TrapIndex]);
#ifdef _M_IX86
PrintText("EAX: %.8lx ESP: %.8lx CR0: %.8lx DR0: %.8lx\n",
TrapFrame->SegSs, Special->Ldtr, Special->Idtr.Limit);
InstructionPointer = (PUCHAR)TrapFrame->Rip;
#endif
- PrintText("\nInstructionstream: %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x \n",
+ PrintText("\nInstruction stream: %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x \n",
InstructionPointer[0], InstructionPointer[1],
InstructionPointer[2], InstructionPointer[3],
InstructionPointer[4], InstructionPointer[5],
}
VOID
-NTAPI
FrLdrBugCheckWithMessage(
ULONG BugCode,
PCHAR File,
PSTR Format,
...)
{
- CHAR Buffer[1024];
va_list argptr;
- /* Blue screen for the win */
+ MachVideoHideShowTextCursor(FALSE);
MachVideoClearScreen(SCREEN_ATTR);
i386_ScreenPosX = 0;
i386_ScreenPosY = 0;
}
va_start(argptr, Format);
- _vsnprintf(Buffer, sizeof(Buffer), Format, argptr);
+ PrintTextV(Format, argptr);
va_end(argptr);
- Buffer[sizeof(Buffer) - 1] = 0;
-
- i386PrintText(Buffer);
_disable();
__halt();
PCHAR File,
ULONG Line)
{
+ MachVideoHideShowTextCursor(FALSE);
MachVideoClearScreen(SCREEN_ATTR);
i386_ScreenPosX = 0;
i386_ScreenPosY = 0;
PrintText("Bug Information:\n %p\n %p\n %p\n %p\n %p\n\n",
BugCheckInfo[0], BugCheckInfo[1], BugCheckInfo[2], BugCheckInfo[3], BugCheckInfo[4]);
+ _disable();
+ __halt();
for (;;);
}
{
FrLdrBugCheckEx(BugCode, 0, 0);
}
-