From 3ce420e01dbeebdd402f6bc114f486a9732aa752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Fr=C3=B6schle?= Date: Mon, 30 Dec 2013 11:24:14 +0000 Subject: [PATCH] renamed all files which are part of the x86 emulator to start with "x86" --- BaS_gcc/Makefile | 16 ++--- BaS_gcc/bas.lk.in | 16 ++--- BaS_gcc/include/fb.h | 31 ---------- BaS_gcc/include/fpu.h | 61 ------------------- BaS_gcc/include/radeonfb.h | 2 +- BaS_gcc/include/wait.h | 4 ++ BaS_gcc/include/{fpu_regs.h => x86fpu_regs.h} | 0 BaS_gcc/radeon/radeon_base.c | 20 +++--- BaS_gcc/x86emu/{biosemu.c => x86biosemu.c} | 2 +- BaS_gcc/x86emu/{debug.c => x86debug.c} | 0 BaS_gcc/x86emu/{decode.c => x86decode.c} | 0 BaS_gcc/x86emu/{fpu.c => x86fpu.c} | 4 +- BaS_gcc/x86emu/{ops.c => x86ops.c} | 0 BaS_gcc/x86emu/{ops2.c => x86ops2.c} | 0 BaS_gcc/x86emu/{prim_ops.c => x86prim_ops.c} | 0 BaS_gcc/x86emu/{sys.c => x86sys.c} | 0 16 files changed, 35 insertions(+), 121 deletions(-) delete mode 100644 BaS_gcc/include/fpu.h rename BaS_gcc/include/{fpu_regs.h => x86fpu_regs.h} (100%) rename BaS_gcc/x86emu/{biosemu.c => x86biosemu.c} (99%) rename BaS_gcc/x86emu/{debug.c => x86debug.c} (100%) rename BaS_gcc/x86emu/{decode.c => x86decode.c} (100%) rename BaS_gcc/x86emu/{fpu.c => x86fpu.c} (99%) rename BaS_gcc/x86emu/{ops.c => x86ops.c} (100%) rename BaS_gcc/x86emu/{ops2.c => x86ops2.c} (100%) rename BaS_gcc/x86emu/{prim_ops.c => x86prim_ops.c} (100%) rename BaS_gcc/x86emu/{sys.c => x86sys.c} (100%) diff --git a/BaS_gcc/Makefile b/BaS_gcc/Makefile index 7f0a86d..7172be3 100644 --- a/BaS_gcc/Makefile +++ b/BaS_gcc/Makefile @@ -116,14 +116,14 @@ CSRCS= \ radeon_cursor.c \ radeon_monitor.c \ \ - decode.c \ - sys.c \ - debug.c \ - prim_ops.c \ - ops.c \ - ops2.c \ - fpu.c \ - biosemu.c \ + x86decode.c \ + x86sys.c \ + x86debug.c \ + x86prim_ops.c \ + x86ops.c \ + x86ops2.c \ + x86fpu.c \ + x86biosemu.c \ x86pcibios.c \ \ basflash.c \ diff --git a/BaS_gcc/bas.lk.in b/BaS_gcc/bas.lk.in index 8815693..9129a45 100644 --- a/BaS_gcc/bas.lk.in +++ b/BaS_gcc/bas.lk.in @@ -86,14 +86,14 @@ SECTIONS OBJDIR/fbmodedb.o OBJDIR/offscreen.o - OBJDIR/decode.o - OBJDIR/ops.o - OBJDIR/ops2.o - OBJDIR/fpu.o - OBJDIR/sys.o - OBJDIR/biosemu.o - OBJDIR/debug.o - OBJDIR/prim_ops.o + OBJDIR/x86decode.o + OBJDIR/x86ops.o + OBJDIR/x86ops2.o + OBJDIR/x86fpu.o + OBJDIR/x86sys.o + OBJDIR/x86biosemu.o + OBJDIR/x86debug.o + OBJDIR/x86prim_ops.o OBJDIR/x86pcibios.o OBJDIR/radeon_base.o diff --git a/BaS_gcc/include/fb.h b/BaS_gcc/include/fb.h index 4989d40..f814151 100644 --- a/BaS_gcc/include/fb.h +++ b/BaS_gcc/include/fb.h @@ -541,42 +541,11 @@ extern void udelay(long usec); #define US_TO_TIMER(a) (((a)*256)/5000) #define TIMER_TO_US(a) (((a)*5000)/256) #endif -extern long get_timer(void); extern void start_timeout(void); extern int end_timeout(long msec); extern void mdelay(long msec); extern void install_vbl_timer(void *func, int remove); extern void uninstall_vbl_timer(void *func); -/* - * fVDI access - */ -extern void Funcs_copymem(const void *s, void *d, long n); -extern const char *Funcs_next_line(const char *ptr); -extern const char *Funcs_skip_space(const char *ptr); -extern const char *Funcs_get_token(const char *ptr, char *buf, long n); -extern long Funcs_equal(const char *str1, const char *str2); -extern long Funcs_length(const char *text); -extern void Funcs_copy(const char *src, char *dest); -extern void Funcs_cat(const char *src, char *dest); -extern long Funcs_numeric(long ch); -extern long Funcs_atol(const char *text); -extern void Funcs_error(const char *text1, const char *text2); -extern void *Funcs_malloc(long size, long type); -extern long Funcs_free(void *addr); -extern int Funcs_puts(const char *text); -extern void Funcs_ltoa(char *buf, long n, unsigned long base); -extern long Funcs_get_cookie(const unsigned char *cname, long super); -extern long Funcs_set_cookie(const unsigned char *cname, long value); -//extern long Funcs_fixup_font(Fontheader *font, char *buffer, long flip); -//extern long Funcs_unpack_font(Fontheader *header, long format); -//extern long Funcs_insert_font(Fontheader **first_font, Fontheader *new_font); -extern long Funcs_get_size(const char *name); -extern char *Funcs_allocate_block(long size); -extern void Funcs_free_block(void *address); -extern void Funcs_cache_flush(void); -extern long Funcs_misc(long func, long par, const char *token); -extern long Funcs_event(long id_type, long data); - extern struct fb_info *info_fvdi; #endif /* _FB_H */ diff --git a/BaS_gcc/include/fpu.h b/BaS_gcc/include/fpu.h deleted file mode 100644 index 5fb2714..0000000 --- a/BaS_gcc/include/fpu.h +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** -* -* Realmode X86 Emulator Library -* -* Copyright (C) 1996-1999 SciTech Software, Inc. -* Copyright (C) David Mosberger-Tang -* Copyright (C) 1999 Egbert Eich -* -* ======================================================================== -* -* Permission to use, copy, modify, distribute, and sell this software and -* its documentation for any purpose is hereby granted without fee, -* provided that the above copyright notice appear in all copies and that -* both that copyright notice and this permission notice appear in -* supporting documentation, and that the name of the authors not be used -* in advertising or publicity pertaining to distribution of the software -* without specific, written prior permission. The authors makes no -* representations about the suitability of this software for any purpose. -* It is provided "as is" without express or implied warranty. -* -* THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -* EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR -* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF -* USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR -* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -* PERFORMANCE OF THIS SOFTWARE. -* -* ======================================================================== -* -* Language: ANSI C -* Environment: Any -* Developer: Kendall Bennett -* -* Description: Header file for FPU instruction decoding. -* -****************************************************************************/ - -#ifndef __X86EMU_FPU_H -#define __X86EMU_FPU_H - -#ifdef __cplusplus -extern "C" { /* Use "C" linkage when in C++ mode */ -#endif - -/* these have to be defined, whether 8087 support compiled in or not. */ - -extern void x86emuOp_esc_coprocess_d8 (u8 op1); -extern void x86emuOp_esc_coprocess_d9 (u8 op1); -extern void x86emuOp_esc_coprocess_da (u8 op1); -extern void x86emuOp_esc_coprocess_db (u8 op1); -extern void x86emuOp_esc_coprocess_dc (u8 op1); -extern void x86emuOp_esc_coprocess_dd (u8 op1); -extern void x86emuOp_esc_coprocess_de (u8 op1); -extern void x86emuOp_esc_coprocess_df (u8 op1); - -#ifdef __cplusplus -} /* End of "C" linkage for C++ */ -#endif - -#endif /* __X86EMU_FPU_H */ diff --git a/BaS_gcc/include/radeonfb.h b/BaS_gcc/include/radeonfb.h index e1ebd70..de609a1 100644 --- a/BaS_gcc/include/radeonfb.h +++ b/BaS_gcc/include/radeonfb.h @@ -658,7 +658,7 @@ extern int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id extern void radeonfb_pci_unregister(void); /* global */ -extern uint8_t monitor_layout[]; +extern const char monitor_layout[]; extern int16_t default_dynclk; extern int16_t ignore_edid; extern int16_t mirror; diff --git a/BaS_gcc/include/wait.h b/BaS_gcc/include/wait.h index 347fadf..c5002db 100644 --- a/BaS_gcc/include/wait.h +++ b/BaS_gcc/include/wait.h @@ -42,6 +42,10 @@ typedef bool (*checker_func)(void); extern __inline__ void wait(uint32_t) __attribute__((always_inline)); extern __inline__ bool waitfor(uint32_t us, checker_func condition) __attribute__((always_inline)); +extern __inline__ uint32_t get_timer(void) +{ + return MCF_SLT_SCNT(0); +} /* * wait for the specified number of us on slice timer 0. Replaces the original routines that had * the number of useconds to wait for hardcoded in their name. diff --git a/BaS_gcc/include/fpu_regs.h b/BaS_gcc/include/x86fpu_regs.h similarity index 100% rename from BaS_gcc/include/fpu_regs.h rename to BaS_gcc/include/x86fpu_regs.h diff --git a/BaS_gcc/radeon/radeon_base.c b/BaS_gcc/radeon/radeon_base.c index 8f5cf39..a2fbb60 100644 --- a/BaS_gcc/radeon/radeon_base.c +++ b/BaS_gcc/radeon/radeon_base.c @@ -475,7 +475,7 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo) ipl = set_ipl(0); start_tv = get_timer(); - while(read_vline_crnt(rinfo) != 0) + while (read_vline_crnt(rinfo) != 0) { if ((get_timer() - start_tv) > US_TO_TIMER(10000000UL)) /* 10 sec */ { @@ -487,7 +487,7 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo) if (!timeout) { start_tv = get_timer(); - while(read_vline_crnt(rinfo) == 0) + while (read_vline_crnt(rinfo) == 0) { if ((get_timer() - start_tv) > US_TO_TIMER(1000000UL)) /* 1 sec */ { @@ -497,7 +497,7 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo) } if (!timeout) { - while(read_vline_crnt(rinfo) != 0) + while (read_vline_crnt(rinfo) != 0) { if ((get_timer() - start_tv) > US_TO_TIMER(10000000UL)) /* 10 sec */ { @@ -1207,7 +1207,7 @@ static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_reg OUTPLLP(PPLL_DIV_3, mode->ppll_div_3, ~PPLL_FB3_DIV_MASK); OUTPLLP(PPLL_DIV_3, mode->ppll_div_3, ~PPLL_POST3_DIV_MASK); /* Write update */ - while(INPLL(PPLL_REF_DIV) & PPLL_ATOMIC_UPDATE_R); + while (INPLL(PPLL_REF_DIV) & PPLL_ATOMIC_UPDATE_R); OUTPLLP(PPLL_REF_DIV, PPLL_ATOMIC_UPDATE_W, ~PPLL_ATOMIC_UPDATE_W); /* Wait read update complete */ /* FIXME: Certain revisions of R300 can't recover here. Not sure of @@ -1227,7 +1227,7 @@ static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_reg static void radeon_wait_vbl(struct fb_info *info) { uint32_t cnt = INREG(CRTC_CRNT_FRAME); - while(cnt == INREG(CRTC_CRNT_FRAME)); + while (cnt == INREG(CRTC_CRNT_FRAME)); } static void radeon_timer_func(void) @@ -1273,7 +1273,7 @@ static void radeon_timer_func(void) w += (int32_t)skipleft; info->fbops->SetupForScanlineCPUToScreenColorExpandFill(info,(int)foreground,(int)background,3,0xffffffff); info->fbops->SubsequentScanlineCPUToScreenColorExpandFill(info,(int)dst_x,0,w,h,skipleft); - while(--h >= 0) + while (--h >= 0) { info->fbops->SubsequentScanline(info, (unsigned long *) src_buf); src_buf += (info->var.xres_virtual >> 3); @@ -1430,7 +1430,7 @@ static void radeon_calc_pll_regs(struct radeonfb_info *rinfo, struct radeon_regs * divider. I'll find a better fix once I have more infos on the * real cause of the problem. */ - while(rinfo->has_CRTC2) + while (rinfo->has_CRTC2) { uint32_t fp2_gen_cntl = INREG(FP2_GEN_CNTL); uint32_t disp_output_cntl; @@ -1972,11 +1972,13 @@ int32_t radeonfb_pci_register(int32_t handle, const struct pci_device_id *ent) info = framebuffer_alloc(sizeof(struct radeonfb_info)); if (!info) return -1; // -ENOMEM; + rinfo = info->par; + rinfo->info = info; rinfo->handle = handle; - rinfo->name[11] = (char)(ent->device >> 8); - rinfo->name[12] = (char)ent->device; + rinfo->name[11] = (char) (ent->device >> 8); + rinfo->name[12] = (char) ent->device; rinfo->family = ent->driver_data & CHIP_FAMILY_MASK; rinfo->chipset = ent->device; rinfo->has_CRTC2 = (ent->driver_data & CHIP_HAS_CRTC2) != 0; diff --git a/BaS_gcc/x86emu/biosemu.c b/BaS_gcc/x86emu/x86biosemu.c similarity index 99% rename from BaS_gcc/x86emu/biosemu.c rename to BaS_gcc/x86emu/x86biosemu.c index 565115a..585c57c 100644 --- a/BaS_gcc/x86emu/biosemu.c +++ b/BaS_gcc/x86emu/x86biosemu.c @@ -528,7 +528,7 @@ void run_bios(struct radeonfb_info *rinfo) struct pci_data *rom_data; unsigned long rom_size=0; unsigned long image_size=0; - unsigned long biosmem = 0x01000000; /* when run_bios() is called, SDRAM is valid but not added to the system */ + void *biosmem = (void *) 0x01000000; /* when run_bios() is called, SDRAM is valid but not added to the system */ unsigned long addr; unsigned short initialcs; unsigned short initialip; diff --git a/BaS_gcc/x86emu/debug.c b/BaS_gcc/x86emu/x86debug.c similarity index 100% rename from BaS_gcc/x86emu/debug.c rename to BaS_gcc/x86emu/x86debug.c diff --git a/BaS_gcc/x86emu/decode.c b/BaS_gcc/x86emu/x86decode.c similarity index 100% rename from BaS_gcc/x86emu/decode.c rename to BaS_gcc/x86emu/x86decode.c diff --git a/BaS_gcc/x86emu/fpu.c b/BaS_gcc/x86emu/x86fpu.c similarity index 99% rename from BaS_gcc/x86emu/fpu.c rename to BaS_gcc/x86emu/x86fpu.c index 9bed152..2608a35 100644 --- a/BaS_gcc/x86emu/fpu.c +++ b/BaS_gcc/x86emu/x86fpu.c @@ -39,8 +39,8 @@ #include "x86debug.h" #include "x86emui.h" -#include "fpu.h" -#include "fpu_regs.h" +#include "x86fpu.h" +#include "x86fpu_regs.h" /*----------------------------- Implementation ----------------------------*/ diff --git a/BaS_gcc/x86emu/ops.c b/BaS_gcc/x86emu/x86ops.c similarity index 100% rename from BaS_gcc/x86emu/ops.c rename to BaS_gcc/x86emu/x86ops.c diff --git a/BaS_gcc/x86emu/ops2.c b/BaS_gcc/x86emu/x86ops2.c similarity index 100% rename from BaS_gcc/x86emu/ops2.c rename to BaS_gcc/x86emu/x86ops2.c diff --git a/BaS_gcc/x86emu/prim_ops.c b/BaS_gcc/x86emu/x86prim_ops.c similarity index 100% rename from BaS_gcc/x86emu/prim_ops.c rename to BaS_gcc/x86emu/x86prim_ops.c diff --git a/BaS_gcc/x86emu/sys.c b/BaS_gcc/x86emu/x86sys.c similarity index 100% rename from BaS_gcc/x86emu/sys.c rename to BaS_gcc/x86emu/x86sys.c