Revision 0d84be5b

b/hw/etraxfs_eth.c
401 401
	eth->macaddr[ma][i++] = eth->regs[reg] >> 16;
402 402
	eth->macaddr[ma][i++] = eth->regs[reg] >> 24;
403 403
	eth->macaddr[ma][i++] = eth->regs[reg + 1];
404
	eth->macaddr[ma][i++] = eth->regs[reg + 1] >> 8;
404
	eth->macaddr[ma][i] = eth->regs[reg + 1] >> 8;
405 405

  
406 406
	D(printf("set mac%d=%x.%x.%x.%x.%x.%x\n", ma,
407 407
		 eth->macaddr[ma][0], eth->macaddr[ma][1],
b/target-cris/mmu.c
327 327
		       CPUState *env, uint32_t vaddr,
328 328
		       int rw, int mmu_idx)
329 329
{
330
	uint32_t phy = vaddr;
331 330
	int seg;
332 331
	int miss = 0;
333 332
	int is_user = mmu_idx == MMU_USER_IDX;
......
351 350

  
352 351
		miss = 0;
353 352
		base = cris_mmu_translate_seg(env, seg);
354
		phy = base | (0x0fffffff & vaddr);
355
		res->phy = phy;
353
                res->phy = base | (0x0fffffff & vaddr);
356 354
		res->prot = PAGE_BITS;
357 355
	}
358 356
	else
b/target-cris/translate.c
1292 1292
static int dec_prep_move_m(DisasContext *dc, int s_ext, int memsize,
1293 1293
			   TCGv dst)
1294 1294
{
1295
	unsigned int rs, rd;
1295
	unsigned int rs;
1296 1296
	uint32_t imm;
1297 1297
	int is_imm;
1298 1298
	int insn_len = 2;
1299 1299

  
1300 1300
	rs = dc->op1;
1301
	rd = dc->op2;
1302 1301
	is_imm = rs == 15 && dc->postinc;
1303 1302

  
1304 1303
	/* Load [$rs] onto T1.  */
......
1367 1366
	int32_t offset;
1368 1367
	int sign;
1369 1368
	uint32_t cond = dc->op2;
1370
	int tmp;
1371 1369

  
1372 1370
	offset = EXTRACT_FIELD (dc->ir, 1, 7);
1373 1371
	sign = EXTRACT_FIELD(dc->ir, 0, 0);
1374 1372

  
1375 1373
	offset *= 2;
1376 1374
	offset |= sign << 8;
1377
	tmp = offset;
1378 1375
	offset = sign_extend(offset, 8);
1379 1376

  
1380 1377
	LOG_DIS("b%s %x\n", cc_name(cond), dc->pc + offset);

Also available in: Unified diff