Skip to content

Enable target sparc-softmmu #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mikel-fernandez wants to merge 1 commit into
base: mtrace
Choose a base branch
from
+17 −6
Open

Enable target sparc-softmmu #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions mtrace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,12 +510,12 @@ void mtrace_io_read(void *cb, target_phys_addr_t ram_addr,
/* Nothing to do.. */
}

static inline uint64_t mtrace_get_percore_tsc(CPUX86State *env)
static inline uint64_t mtrace_get_percore_tsc(CPUState *env)
{
return mtrace_inst_count[env->cpu_index];
}

static inline uint64_t mtrace_get_global_tsc(CPUX86State *env)
static inline uint64_t mtrace_get_global_tsc(CPUState *env)
{
uint64_t t;
int i;
Expand All @@ -526,7 +526,7 @@ static inline uint64_t mtrace_get_global_tsc(CPUX86State *env)
return t;
}

void mtrace_lock_start(CPUX86State *env)
void mtrace_lock_start(CPUState *env)
{
if (!mtrace_lock_trace)
return;
Expand All @@ -547,7 +547,7 @@ void mtrace_lock_start(CPUX86State *env)
mtrace_lock_active[env->cpu_index] = 1;
}

void mtrace_lock_stop(CPUX86State *env)
void mtrace_lock_stop(CPUState *env)
{
if (!mtrace_lock_trace)
return;
Expand Down Expand Up @@ -667,7 +667,7 @@ static void mtrace_entry_register(target_ulong entry_addr, target_ulong type,
*
* A simple solution is probably to log multiple mtrace_label_entrys.
*/
r = mtrace_host_addr(entry.label.guest_addr, &entry.label.host_addr);
r = mtrace_host_addr(entry.label.guest_addr, (target_ulong*) &entry.label.host_addr);
if (r) {
fprintf(stderr, "mtrace_entry_register: mtrace_host_addr failed (%"PRIx64")\n",
entry.label.guest_addr);
Expand Down
2 changes: 1 addition & 1 deletion qemu-doc.texi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ VGA BIOS.
QEMU uses YM3812 emulation by Tatsuyuki Satoh.

QEMU uses GUS emulation (GUSEMU32 @url{http://www.deinmeister.de/gusemu/})
by Tibor "TS" Schütz.
by Tibor "TS" Schutz.

Not that, by default, GUS shares IRQ(7) with parallel ports and so
qemu must be told to not have parallel ports to have working GUS
Expand Down
11 changes: 11 additions & 0 deletions target-sparc/cpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
#define ELF_MACHINE EM_SPARCV9
#endif

#define R_CS 0

/*#define EXCP_INTERRUPT 0x100*/

/* trap definitions */
Expand Down Expand Up @@ -323,12 +325,21 @@ struct QEMUFile;
void cpu_put_timer(struct QEMUFile *f, CPUTimer *s);
void cpu_get_timer(struct QEMUFile *f, CPUTimer *s);

typedef struct SegmentCache {
uint32_t selector;
target_ulong base;
uint32_t limit;
uint32_t flags;
} SegmentCache;

typedef struct CPUSPARCState {
target_ulong gregs[8]; /* general registers */
target_ulong *regwptr; /* pointer to current register window */
target_ulong pc; /* program counter */
target_ulong npc; /* next program counter */
target_ulong y; /* multiply/divide register */
target_ulong eip; /* */
SegmentCache segs[1]; /* selector values */

/* emulator internal flags handling */
target_ulong cc_src, cc_src2;
Expand Down