Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
ccaeb3ed
Commit
ccaeb3ed
authored
Sep 18, 2010
by
André Hentschel
Committed by
Alexandre Julliard
Sep 20, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Add ARM support.
parent
ed59c54d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
3 deletions
+21
-3
server_protocol.h
include/wine/server_protocol.h
+4
-2
protocol.def
server/protocol.def
+3
-1
thread.c
server/thread.c
+6
-0
trace.c
server/trace.c
+8
-0
No files found.
include/wine/server_protocol.h
View file @
ccaeb3ed
...
...
@@ -129,7 +129,7 @@ typedef union
enum
cpu_type
{
CPU_x86
,
CPU_x86_64
,
CPU_ALPHA
,
CPU_POWERPC
,
CPU_SPARC
CPU_x86
,
CPU_x86_64
,
CPU_ALPHA
,
CPU_POWERPC
,
CPU_
ARM
,
CPU_
SPARC
};
typedef
int
cpu_type_t
;
...
...
@@ -146,6 +146,7 @@ typedef struct
struct
{
unsigned
__int64
fir
;
unsigned
int
psr
,
__pad
;
}
alpha_regs
;
struct
{
unsigned
int
iar
,
msr
,
ctr
,
lr
,
dar
,
dsisr
,
trap
,
__pad
;
}
powerpc_regs
;
struct
{
unsigned
int
sp
,
lr
,
pc
,
cpsr
;
}
arm_regs
;
struct
{
unsigned
int
psr
,
pc
,
npc
,
y
,
wim
,
tbr
;
}
sparc_regs
;
}
ctl
;
union
...
...
@@ -156,6 +157,7 @@ typedef struct
struct
{
unsigned
__int64
v0
,
t0
,
t1
,
t2
,
t3
,
t4
,
t5
,
t6
,
t7
,
t8
,
t9
,
t10
,
t11
,
t12
,
s0
,
s1
,
s2
,
s3
,
s4
,
s5
,
s6
,
a0
,
a1
,
a2
,
a3
,
a4
,
a5
,
at
;
}
alpha_regs
;
struct
{
unsigned
int
gpr
[
32
],
cr
,
xer
;
}
powerpc_regs
;
struct
{
unsigned
int
r
[
13
];
}
arm_regs
;
struct
{
unsigned
int
g
[
8
],
o
[
8
],
l
[
8
],
i
[
8
];
}
sparc_regs
;
}
integer
;
union
...
...
@@ -5515,6 +5517,6 @@ union generic_reply
struct
set_cursor_reply
set_cursor_reply
;
};
#define SERVER_PROTOCOL_VERSION 40
8
#define SERVER_PROTOCOL_VERSION 40
9
#endif
/* __WINE_WINE_SERVER_PROTOCOL_H */
server/protocol.def
View file @
ccaeb3ed
...
...
@@ -145,7 +145,7 @@ typedef union
/* supported CPU types */
enum cpu_type
{
CPU_x86, CPU_x86_64, CPU_ALPHA, CPU_POWERPC, CPU_SPARC
CPU_x86, CPU_x86_64, CPU_ALPHA, CPU_POWERPC, CPU_
ARM, CPU_
SPARC
};
typedef int cpu_type_t;
...
...
@@ -162,6 +162,7 @@ typedef struct
struct { unsigned __int64 fir;
unsigned int psr, __pad; } alpha_regs;
struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs;
struct { unsigned int sp, lr, pc, cpsr; } arm_regs;
struct { unsigned int psr, pc, npc, y, wim, tbr; } sparc_regs;
} ctl; /* selected by SERVER_CTX_CONTROL */
union
...
...
@@ -172,6 +173,7 @@ typedef struct
struct { unsigned __int64 v0, t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12,
s0, s1, s2, s3, s4, s5, s6, a0, a1, a2, a3, a4, a5, at; } alpha_regs;
struct { unsigned int gpr[32], cr, xer; } powerpc_regs;
struct { unsigned int r[13]; } arm_regs;
struct { unsigned int g[8], o[8], l[8], i[8]; } sparc_regs;
} integer; /* selected by SERVER_CTX_INTEGER */
union
...
...
server/thread.c
View file @
ccaeb3ed
...
...
@@ -63,6 +63,8 @@ static const unsigned int supported_cpus = CPU_FLAG(CPU_ALPHA);
static
const
unsigned
int
supported_cpus
=
CPU_FLAG
(
CPU_POWERPC
);
#elif defined(__sparc__)
static
const
unsigned
int
supported_cpus
=
CPU_FLAG
(
CPU_SPARC
);
#elif defined(__arm__)
static
const
unsigned
int
supported_cpus
=
CPU_FLAG
(
CPU_ARM
);
#else
#error Unsupported CPU
#endif
...
...
@@ -1000,6 +1002,7 @@ static unsigned int get_context_system_regs( enum cpu_type cpu )
case
CPU_x86_64
:
return
SERVER_CTX_DEBUG_REGISTERS
;
case
CPU_ALPHA
:
return
0
;
case
CPU_POWERPC
:
return
0
;
case
CPU_ARM
:
return
0
;
case
CPU_SPARC
:
return
0
;
}
return
0
;
...
...
@@ -1033,6 +1036,9 @@ void break_thread( struct thread *thread )
case
CPU_SPARC
:
data
.
exception
.
address
=
thread
->
context
->
ctl
.
sparc_regs
.
pc
;
break
;
case
CPU_ARM
:
data
.
exception
.
address
=
thread
->
context
->
ctl
.
arm_regs
.
pc
;
break
;
}
generate_debug_event
(
thread
,
EXCEPTION_DEBUG_EVENT
,
&
data
);
thread
->
debug_break
=
0
;
...
...
server/trace.c
View file @
ccaeb3ed
...
...
@@ -569,6 +569,14 @@ static void dump_varargs_context( const char *prefix, data_size_t size )
fprintf
(
stderr
,
",fpscr=%g"
,
ctx
.
fp
.
powerpc_regs
.
fpscr
);
}
break
;
case
CPU_ARM
:
if
(
ctx
.
flags
&
SERVER_CTX_CONTROL
)
fprintf
(
stderr
,
",sp=%08x,lr=%08x,pc=%08x,cpsr=%08x"
,
ctx
.
ctl
.
arm_regs
.
sp
,
ctx
.
ctl
.
arm_regs
.
lr
,
ctx
.
ctl
.
arm_regs
.
pc
,
ctx
.
ctl
.
arm_regs
.
cpsr
);
if
(
ctx
.
flags
&
SERVER_CTX_INTEGER
)
for
(
i
=
0
;
i
<
13
;
i
++
)
fprintf
(
stderr
,
",r%u=%08x"
,
i
,
ctx
.
integer
.
arm_regs
.
r
[
i
]
);
break
;
case
CPU_SPARC
:
if
(
ctx
.
flags
&
SERVER_CTX_CONTROL
)
fprintf
(
stderr
,
",psr=%08x,pc=%08x,npc=%08x,y=%08x,wim=%08x,tbr=%08x"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment