Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "These changes are the raw update to qemu-2.6."
[kvmfornfv.git]
/
qemu
/
linux-user
/
arm
/
nwfpe
/
fpa11.h
diff --git
a/qemu/linux-user/arm/nwfpe/fpa11.h
b/qemu/linux-user/arm/nwfpe/fpa11.h
index
bb9ac65
..
0b07284
100644
(file)
--- a/
qemu/linux-user/arm/nwfpe/fpa11.h
+++ b/
qemu/linux-user/arm/nwfpe/fpa11.h
@@
-21,9
+21,6
@@
#ifndef __FPA11_H__
#define __FPA11_H__
#ifndef __FPA11_H__
#define __FPA11_H__
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
#include <cpu.h>
#include <cpu.h>
@@
-108,7
+105,7
@@
static inline void writeRegister(unsigned int x, unsigned int y)
static inline void writeConditionCodes(unsigned int x)
{
static inline void writeConditionCodes(unsigned int x)
{
-
cpsr_write(user_registers,x,CPSR_NZCV
);
+
cpsr_write(user_registers, x, CPSR_NZCV, CPSRWriteByInstr
);
}
#define ARM_REG_PC 15
}
#define ARM_REG_PC 15