Diff for /qemu/softmmu-semi.h between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2018/04/24 18:56:38 version 1.1.1.4, 2018/04/24 19:35:06
Line 7 Line 7
  * This code is licensed under the GPL   * This code is licensed under the GPL
  */   */
   
 static inline uint32_t softmmu_tget32(CPUState *env, uint32_t addr)  static inline uint32_t softmmu_tget32(CPUArchState *env, uint32_t addr)
 {  {
     uint32_t val;      uint32_t val;
   
     cpu_memory_rw_debug(env, addr, (uint8_t *)&val, 4, 0);      cpu_memory_rw_debug(env, addr, (uint8_t *)&val, 4, 0);
     return tswap32(val);      return tswap32(val);
 }  }
 static inline uint32_t softmmu_tget8(CPUState *env, uint32_t addr)  static inline uint32_t softmmu_tget8(CPUArchState *env, uint32_t addr)
 {  {
     uint8_t val;      uint8_t val;
   
Line 26  static inline uint32_t softmmu_tget8(CPU Line 26  static inline uint32_t softmmu_tget8(CPU
 #define get_user_u8(arg, p) ({ arg = softmmu_tget8(env, p) ; 0; })  #define get_user_u8(arg, p) ({ arg = softmmu_tget8(env, p) ; 0; })
 #define get_user_ual(arg, p) get_user_u32(arg, p)  #define get_user_ual(arg, p) get_user_u32(arg, p)
   
 static inline void softmmu_tput32(CPUState *env, uint32_t addr, uint32_t val)  static inline void softmmu_tput32(CPUArchState *env, uint32_t addr, uint32_t val)
 {  {
     val = tswap32(val);      val = tswap32(val);
     cpu_memory_rw_debug(env, addr, (uint8_t *)&val, 4, 1);      cpu_memory_rw_debug(env, addr, (uint8_t *)&val, 4, 1);
Line 34  static inline void softmmu_tput32(CPUSta Line 34  static inline void softmmu_tput32(CPUSta
 #define put_user_u32(arg, p) ({ softmmu_tput32(env, p, arg) ; 0; })  #define put_user_u32(arg, p) ({ softmmu_tput32(env, p, arg) ; 0; })
 #define put_user_ual(arg, p) put_user_u32(arg, p)  #define put_user_ual(arg, p) put_user_u32(arg, p)
   
 static void *softmmu_lock_user(CPUState *env, uint32_t addr, uint32_t len,  static void *softmmu_lock_user(CPUArchState *env, uint32_t addr, uint32_t len,
                                int copy)                                 int copy)
 {  {
     uint8_t *p;      uint8_t *p;
Line 45  static void *softmmu_lock_user(CPUState  Line 45  static void *softmmu_lock_user(CPUState 
     return p;      return p;
 }  }
 #define lock_user(type, p, len, copy) softmmu_lock_user(env, p, len, copy)  #define lock_user(type, p, len, copy) softmmu_lock_user(env, p, len, copy)
 static char *softmmu_lock_user_string(CPUState *env, uint32_t addr)  static char *softmmu_lock_user_string(CPUArchState *env, uint32_t addr)
 {  {
     char *p;      char *p;
     char *s;      char *s;
Line 60  static char *softmmu_lock_user_string(CP Line 60  static char *softmmu_lock_user_string(CP
     return s;      return s;
 }  }
 #define lock_user_string(p) softmmu_lock_user_string(env, p)  #define lock_user_string(p) softmmu_lock_user_string(env, p)
 static void softmmu_unlock_user(CPUState *env, void *p, target_ulong addr,  static void softmmu_unlock_user(CPUArchState *env, void *p, target_ulong addr,
                                 target_ulong len)                                  target_ulong len)
 {  {
     if (len)      if (len)

Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4


unix.superglobalmegacorp.com