Parent Directory
| 
Revision Log
++ trunk/HISTORY (local) $Id: HISTORY,v 1.1298 2006/07/22 11:27:46 debug Exp $ 20060626 Continuing on SPARC emulation (beginning on the 'save' instruction, register windows, etc). 20060629 Planning statistics gathering (new -s command line option), and renaming speed_tricks to allow_instruction_combinations. 20060630 Some minor manual page updates. Various cleanups. Implementing the -s command line option. 20060701 FINALLY found the bug which prevented Linux and Ultrix from running without the ugly hack in the R2000/R3000 cache isol code; it was the phystranslation hint array which was buggy. Removing the phystranslation hint code completely, for now. 20060702 Minor dyntrans cleanups; invalidation of physpages now only invalidate those parts of a page that have actually been translated. (32 parts per page.) Some MIPS non-R3000 speed fixes. Experimenting with MIPS instruction combination for some addiu+bne+sw loops, and sw+sw+sw. Adding support (again) for larger-than-4KB pages in MIPS tlbw*. Continuing on SPARC emulation: adding load/store instructions. 20060704 Fixing a virtual vs physical page shift bug in the new tlbw* implementation. Problem noticed by Jakub Jermar. (Many thanks.) Moving rfe and eret to cpu_mips_instr.c, since that is the only place that uses them nowadays. 20060705 Removing the BSD license from the "testmachine" include files, placing them in the public domain instead; this enables the testmachine stuff to be used from projects which are incompatible with the BSD license for some reason. 20060707 Adding instruction combinations for the R2000/R3000 L1 I-cache invalidation code used by NetBSD/pmax 3.0, lui+addiu, various branches followed by addiu or nop, and jr ra followed by addiu. The time it takes to perform a full NetBSD/pmax R3000 install on the laptop has dropped from 573 seconds to 539. :-) 20060708 Adding a framebuffer controller device (dev_fbctrl), which so far can be used to change the fb resolution during runtime, but in the future will also be useful for accelerated block fill/ copy, and possibly also simplified character output. Adding an instruction combination for NetBSD/pmax' strlen. 20060709 Minor fixes: reading raw files in src/file.c wasn't memblock aligned, removing buggy multi_sw MIPS instruction combination, etc. 20060711 Adding a machine_qemu.c, which contains a "qemu_mips" machine. (It mimics QEMU's MIPS machine mode, so that a test kernel made for QEMU_MIPS also can run in GXemul... at least to some extent.) Adding a short section about how to run this mode to doc/guestoses.html. 20060714 Misc. minor code cleanups. 20060715 Applying a patch which adds getchar() to promemul/yamon.c (from Oleksandr Tymoshenko). Adding yamon.h from NetBSD, and rewriting yamon.c to use it (instead of ugly hardcoded numbers) + some cleanup. 20060716 Found and fixed the bug which broke single-stepping of 64-bit programs between 0.4.0 and 0.4.0.1 (caused by too quick refactoring and no testing). Hopefully this fix will not break too many other things. 20060718 Continuing on the 8253 PIT; it now works with Linux/QEMU_MIPS. Re-adding the sw+sw+sw instr comb (the problem was that I had ignored endian issues); however, it doesn't seem to give any big performance gain. 20060720 Adding a dummy Transputer mode (T414, T800 etc) skeleton (only the 'j' and 'ldc' instructions are implemented so far). :-} 20060721 Adding gtreg.h from NetBSD, updating dev_gt.c to use it, plus misc. other updates to get Linux 2.6 for evbmips/malta working (thanks to Alec Voropay for the details). FINALLY found and fixed the bug which made tlbw* for non-R3000 buggy; it was a reference count problem in the dyntrans core. 20060722 Testing stuff; things seem stable enough for a new release. ============== RELEASE 0.4.1 ==============
| 1 | dpavlin | 4 | #ifndef X11_H |
| 2 | #define X11_H | ||
| 3 | |||
| 4 | /* | ||
| 5 | dpavlin | 28 | * Copyright (C) 2003-2006 Anders Gavare. All rights reserved. |
| 6 | dpavlin | 4 | * |
| 7 | * Redistribution and use in source and binary forms, with or without | ||
| 8 | * modification, are permitted provided that the following conditions are met: | ||
| 9 | * | ||
| 10 | * 1. Redistributions of source code must retain the above copyright | ||
| 11 | * notice, this list of conditions and the following disclaimer. | ||
| 12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer in the | ||
| 14 | * documentation and/or other materials provided with the distribution. | ||
| 15 | * 3. The name of the author may not be used to endorse or promote products | ||
| 16 | * derived from this software without specific prior written permission. | ||
| 17 | * | ||
| 18 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND | ||
| 19 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 20 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 21 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 22 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 23 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 24 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 25 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 26 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 27 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 28 | * SUCH DAMAGE. | ||
| 29 | * | ||
| 30 | * | ||
| 31 | dpavlin | 28 | * $Id: x11.h,v 1.5 2006/07/08 12:30:03 debug Exp $ |
| 32 | dpavlin | 4 | * |
| 33 | * Headerfile for src/x11.c. | ||
| 34 | */ | ||
| 35 | |||
| 36 | #include "misc.h" | ||
| 37 | |||
| 38 | struct emul; | ||
| 39 | |||
| 40 | #ifdef WITH_X11 | ||
| 41 | #include <X11/Xlib.h> | ||
| 42 | #endif | ||
| 43 | |||
| 44 | |||
| 45 | /* x11.c: */ | ||
| 46 | #define N_GRAYCOLORS 16 | ||
| 47 | #define CURSOR_COLOR_TRANSPARENT -1 | ||
| 48 | #define CURSOR_COLOR_INVERT -2 | ||
| 49 | #define CURSOR_MAXY 64 | ||
| 50 | #define CURSOR_MAXX 64 | ||
| 51 | /* Framebuffer windows: */ | ||
| 52 | struct fb_window { | ||
| 53 | int fb_number; | ||
| 54 | |||
| 55 | #ifdef WITH_X11 | ||
| 56 | /* x11_fb_winxsize > 0 for a valid fb_window */ | ||
| 57 | int x11_fb_winxsize, x11_fb_winysize; | ||
| 58 | int scaledown; | ||
| 59 | Display *x11_display; | ||
| 60 | |||
| 61 | int x11_screen; | ||
| 62 | int x11_screen_depth; | ||
| 63 | unsigned long fg_color; | ||
| 64 | unsigned long bg_color; | ||
| 65 | XColor x11_graycolor[N_GRAYCOLORS]; | ||
| 66 | Window x11_fb_window; | ||
| 67 | GC x11_fb_gc; | ||
| 68 | |||
| 69 | XImage *fb_ximage; | ||
| 70 | unsigned char *ximage_data; | ||
| 71 | |||
| 72 | /* -1 means transparent, 0 and up are grayscales */ | ||
| 73 | int cursor_pixels[CURSOR_MAXY][CURSOR_MAXX]; | ||
| 74 | int cursor_x; | ||
| 75 | int cursor_y; | ||
| 76 | int cursor_xsize; | ||
| 77 | int cursor_ysize; | ||
| 78 | int cursor_on; | ||
| 79 | int OLD_cursor_x; | ||
| 80 | int OLD_cursor_y; | ||
| 81 | int OLD_cursor_xsize; | ||
| 82 | int OLD_cursor_ysize; | ||
| 83 | int OLD_cursor_on; | ||
| 84 | |||
| 85 | /* Host's X11 cursor: */ | ||
| 86 | Cursor host_cursor; | ||
| 87 | Pixmap host_cursor_pixmap; | ||
| 88 | #endif | ||
| 89 | }; | ||
| 90 | void x11_redraw_cursor(struct machine *, int); | ||
| 91 | void x11_redraw(struct machine *, int); | ||
| 92 | void x11_putpixel_fb(struct machine *, int, int x, int y, int color); | ||
| 93 | #ifdef WITH_X11 | ||
| 94 | void x11_putimage_fb(struct machine *, int); | ||
| 95 | #endif | ||
| 96 | void x11_init(struct machine *); | ||
| 97 | dpavlin | 6 | void x11_fb_resize(struct fb_window *win, int new_xsize, int new_ysize); |
| 98 | dpavlin | 28 | void x11_set_standard_properties(struct fb_window *fb_window, char *name); |
| 99 | dpavlin | 4 | struct fb_window *x11_fb_init(int xsize, int ysize, char *name, |
| 100 | int scaledown, struct machine *); | ||
| 101 | void x11_check_event(struct emul **emuls, int n_emuls); | ||
| 102 | |||
| 103 | |||
| 104 | #endif /* X11_H */ |
| ViewVC Help | |
| Powered by ViewVC 1.1.26 |