Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-11 04:47:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DBGHELP]

Browse source 
Fix 64 bit compilation. "Should be sent to wine"(tm)

svn path=/trunk/; revision=56259
This commit is contained in:
Timo Kreuzer 2012-03-28 11:08:41 +00:00
parent 00b699d98b
commit d8e68c8aff
2 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/dbghelp/cpu_x86_64.c
View file

@ -281,10 +281,10 @@ static BOOL is_inside_epilog(struct cpu_stack_walk* csw, DWORD64 pc)
if ((op0 & 0xf8) == 0x48)
{
if (!sw_read_mem(csw, pc + 1, &op1, 1)) return FALSE;
if (!sw_read_mem(csw, pc + 2, &op2, 1)) return FALSE;
switch (op1)
{
case 0x81: /* add $nnnn,%rsp */
if (!sw_read_mem(csw, pc + 2, &op2, 1)) return FALSE;
if (op0 == 0x48 && op2 == 0xc4)
{
pc += 7;

24
reactos/dll/win32/dbghelp/dbghelp_ros.diff
View file

@ -3,9 +3,9 @@ Index: stabs.c
--- stabs.c (revision 35085)
+++ stabs.c (working copy)
@@ -64,6 +64,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs);
+#define strtoull _strtoui64
+
/* Masks for n_type field */
@ -16,11 +16,27 @@ Index: cpu_sparc.c
--- cpu_sparc.c (revision 35085)
+++ cpu_sparc.c (working copy)
@@ -29,6 +29,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
+#define IMAGE_FILE_MACHINE_SPARC 0x2000
+
static unsigned sparc_get_addr(HANDLE hThread, const CONTEXT* ctx,
enum cpu_addr ca, ADDRESS64* addr)
{
Index: cpu_x86_64.c
===================================================================
--- cpu_x86_64.c (Revision 56237)
+++ cpu_x86_64.c (Arbeitskopie)
@@ -281,10 +281,10 @@
if ((op0 & 0xf8) == 0x48)
{
if (!sw_read_mem(csw, pc + 1, &op1, 1)) return FALSE;
+ if (!sw_read_mem(csw, pc + 2, &op2, 1)) return FALSE;
switch (op1)
{
case 0x81: /* add $nnnn,%rsp */
- if (!sw_read_mem(csw, pc + 2, &op2, 1)) return FALSE;
if (op0 == 0x48 && op2 == 0xc4)
{
pc += 7;