gwj / at91sam9263 · Commits

Commit eae6ce523890cf2fa56b11f06f67b19797a0d0ee

Authored by balrog
1 parent e1f3808e

Fix a deadly typo, correct comments. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4566 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 6 additions and 4 deletions
tcg/arm/tcg-target.c
  View file @eae6ce5
@@ -78,7 +78,7 @@ static void patch_reloc(uint8_t *code_ptr, int type, @@ -78,7 +78,7 @@ static void patch_reloc(uint8_t *code_ptr, int type,
78 tcg_abort(); 78 tcg_abort();
79 79
80 case R_ARM_PC24: 80 case R_ARM_PC24:
81 - *(uint32_t *) code_ptr |= (*(uint32_t *) code_ptr & 0xff000000) | 81 + *(uint32_t *) code_ptr = ((*(uint32_t *) code_ptr) & 0xff000000) |
82 (((value - ((tcg_target_long) code_ptr + 8)) >> 2) & 0xffffff); 82 (((value - ((tcg_target_long) code_ptr + 8)) >> 2) & 0xffffff);
83 break; 83 break;
84 } 84 }
@@ -109,7 +109,7 @@ int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str) @@ -109,7 +109,7 @@ int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str)
109 break; 109 break;
110 110
111 #ifdef CONFIG_SOFTMMU 111 #ifdef CONFIG_SOFTMMU
112 - /* qemu_ld/st inputs (unless 'd', 'D' or 'X') */ 112 + /* qemu_ld/st inputs (unless 'X' or 'D') */
113 case 'x': 113 case 'x':
114 ct->ct |= TCG_CT_REG; 114 ct->ct |= TCG_CT_REG;
115 tcg_regset_set32(ct->u.regs, 0, (1 << TCG_TARGET_NB_REGS) - 1); 115 tcg_regset_set32(ct->u.regs, 0, (1 << TCG_TARGET_NB_REGS) - 1);
@@ -995,7 +995,8 @@ static inline void tcg_out_qemu_ld(TCGContext *s, int cond, @@ -995,7 +995,8 @@ static inline void tcg_out_qemu_ld(TCGContext *s, int cond,
995 tcg_out_ld32_12(s, COND_AL, data_reg, addr_reg, 0); 995 tcg_out_ld32_12(s, COND_AL, data_reg, addr_reg, 0);
996 break; 996 break;
997 case 3: 997 case 3:
998 - /* TODO: use block load */ 998 + /* TODO: use block load -
  999 + * check that data_reg2 > data_reg or the other way */
999 tcg_out_ld32_12(s, COND_AL, data_reg, addr_reg, 0); 1000 tcg_out_ld32_12(s, COND_AL, data_reg, addr_reg, 0);
1000 tcg_out_ld32_12(s, COND_AL, data_reg2, addr_reg, 4); 1001 tcg_out_ld32_12(s, COND_AL, data_reg2, addr_reg, 4);
1001 break; 1002 break;
@@ -1200,7 +1201,8 @@ static inline void tcg_out_qemu_st(TCGContext *s, int cond, @@ -1200,7 +1201,8 @@ static inline void tcg_out_qemu_st(TCGContext *s, int cond,
1200 tcg_out_st32_12(s, COND_AL, data_reg, addr_reg, 0); 1201 tcg_out_st32_12(s, COND_AL, data_reg, addr_reg, 0);
1201 break; 1202 break;
1202 case 3: 1203 case 3:
1203 - /* TODO: use block store */ 1204 + /* TODO: use block store -
  1205 + * check that data_reg2 > data_reg or the other way */
1204 tcg_out_st32_12(s, COND_AL, data_reg, addr_reg, 0); 1206 tcg_out_st32_12(s, COND_AL, data_reg, addr_reg, 0);
1205 tcg_out_st32_12(s, COND_AL, data_reg2, addr_reg, 4); 1207 tcg_out_st32_12(s, COND_AL, data_reg2, addr_reg, 4);
1206 break; 1208 break;