Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to qemu-2.6.
[kvmfornfv.git]
/
qemu
/
target-microblaze
/
op_helper.c
diff --git
a/qemu/target-microblaze/op_helper.c
b/qemu/target-microblaze/op_helper.c
index
d2b3624
..
9733388
100644
(file)
--- a/
qemu/target-microblaze/op_helper.c
+++ b/
qemu/target-microblaze/op_helper.c
@@
-18,7
+18,7
@@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include
<assert.h>
+#include
"qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "qemu/host-utils.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "qemu/host-utils.h"
@@
-56,7
+56,7
@@
void helper_put(uint32_t id, uint32_t ctrl, uint32_t data)
int nonblock = ctrl & STREAM_NONBLOCK;
int exception = ctrl & STREAM_EXCEPTION;
int nonblock = ctrl & STREAM_NONBLOCK;
int exception = ctrl & STREAM_EXCEPTION;
- qemu_log
(
"Unhandled stream put to stream-id=%d data=%x %s%s%s%s%s\n",
+ qemu_log
_mask(LOG_UNIMP,
"Unhandled stream put to stream-id=%d data=%x %s%s%s%s%s\n",
id, data,
test ? "t" : "",
nonblock ? "n" : "",
id, data,
test ? "t" : "",
nonblock ? "n" : "",
@@
-73,7
+73,7
@@
uint32_t helper_get(uint32_t id, uint32_t ctrl)
int nonblock = ctrl & STREAM_NONBLOCK;
int exception = ctrl & STREAM_EXCEPTION;
int nonblock = ctrl & STREAM_NONBLOCK;
int exception = ctrl & STREAM_EXCEPTION;
- qemu_log
(
"Unhandled stream get from stream-id=%d %s%s%s%s%s\n",
+ qemu_log
_mask(LOG_UNIMP,
"Unhandled stream get from stream-id=%d %s%s%s%s%s\n",
id,
test ? "t" : "",
nonblock ? "n" : "",
id,
test ? "t" : "",
nonblock ? "n" : "",
@@
-151,9
+151,7
@@
uint32_t helper_clz(uint32_t t0)
uint32_t helper_carry(uint32_t a, uint32_t b, uint32_t cf)
{
uint32_t helper_carry(uint32_t a, uint32_t b, uint32_t cf)
{
- uint32_t ncf;
- ncf = compute_carry(a, b, cf);
- return ncf;
+ return compute_carry(a, b, cf);
}
static inline int div_prepare(CPUMBState *env, uint32_t a, uint32_t b)
}
static inline int div_prepare(CPUMBState *env, uint32_t a, uint32_t b)
@@
-468,8
+466,8
@@
void helper_memalign(CPUMBState *env, uint32_t addr, uint32_t dr, uint32_t wr,
void helper_stackprot(CPUMBState *env, uint32_t addr)
{
if (addr < env->slr || addr > env->shr) {
void helper_stackprot(CPUMBState *env, uint32_t addr)
{
if (addr < env->slr || addr > env->shr) {
- qemu_log
(
"Stack protector violation at %x %x %x\n",
- addr, env->slr, env->shr);
+ qemu_log
_mask(CPU_LOG_INT,
"Stack protector violation at %x %x %x\n",
+
addr, env->slr, env->shr);
env->sregs[SR_EAR] = addr;
env->sregs[SR_ESR] = ESR_EC_STACKPROT;
helper_raise_exception(env, EXCP_HW_EXCP);
env->sregs[SR_EAR] = addr;
env->sregs[SR_ESR] = ESR_EC_STACKPROT;
helper_raise_exception(env, EXCP_HW_EXCP);