Revision b14ef7c9 target-sparc/op_helper.c

b/target-sparc/op_helper.c
79 79
#define CACHE_CTRL_FD (1 << 22)  /* Flush Data cache (Write only) */
80 80
#define CACHE_CTRL_DS (1 << 23)  /* Data cache snoop enable */
81 81

  
82
#if defined(CONFIG_USER_ONLY) && defined(TARGET_SPARC64)
82
#if !defined(CONFIG_USER_ONLY)
83
static void do_unassigned_access(target_phys_addr_t addr, int is_write,
84
                                 int is_exec, int is_asi, int size);
85
#else
86
#ifdef TARGET_SPARC64
83 87
static void do_unassigned_access(target_ulong addr, int is_write, int is_exec,
84
                          int is_asi, int size);
88
                                 int is_asi, int size);
89
#endif
85 90
#endif
86 91

  
87 92
#if defined(TARGET_SPARC64) && !defined(CONFIG_USER_ONLY)
......
4235 4240

  
4236 4241
#ifndef TARGET_SPARC64
4237 4242
#if !defined(CONFIG_USER_ONLY)
4238
void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,
4239
                          int is_asi, int size)
4243
static void do_unassigned_access(target_phys_addr_t addr, int is_write,
4244
                                 int is_exec, int is_asi, int size)
4240 4245
{
4241 4246
    CPUState *saved_env;
4242 4247
    int fault_type;
......
4301 4306
static void do_unassigned_access(target_ulong addr, int is_write, int is_exec,
4302 4307
                          int is_asi, int size)
4303 4308
#else
4304
void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,
4305
                          int is_asi, int size)
4309
static void do_unassigned_access(target_phys_addr_t addr, int is_write,
4310
                                 int is_exec, int is_asi, int size)
4306 4311
#endif
4307 4312
{
4308 4313
    CPUState *saved_env;
......
4351 4356
#endif
4352 4357
}
4353 4358
#endif
4359

  
4360
#if !defined(CONFIG_USER_ONLY)
4361
void cpu_unassigned_access(CPUState *env1, target_phys_addr_t addr,
4362
                           int is_write, int is_exec, int is_asi, int size)
4363
{
4364
    env = env1;
4365
    do_unassigned_access(addr, is_write, is_exec, is_asi, size);
4366
}
4367
#endif

Also available in: Unified diff