ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into merge_3_0_0_sync

This commit is contained in:
Matt Borgerson 2018-09-05 20:07:50 -07:00
parent aa32236d5a faf09c632d
commit 6b21948bcc
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -446,7 +446,7 @@ qemu-version.h: FORCE
else \ else \
if test -d .git; then \ if test -d .git; then \
pkgvers=$$(git rev-parse --short HEAD 2>/dev/null | tr -d '\n');\ pkgvers=$$(git rev-parse --short HEAD 2>/dev/null | tr -d '\n');\
if ! git diff-index --quiet HEAD &>/dev/null; then \ if ! git diff --quiet HEAD >/dev/null 2>&1; then \
pkgvers="$${pkgvers}-dirty"; \ pkgvers="$${pkgvers}-dirty"; \
fi; \ fi; \
fi; \ fi; \

3
build.sh
View File

@ -44,7 +44,7 @@ set -x # Print commands from now on
--enable-debug \ --enable-debug \
--extra-cflags="$CFLAGS_COMMON $CFLAGS" \ --extra-cflags="$CFLAGS_COMMON $CFLAGS" \
$CONFIGURE \ $CONFIGURE \
--target-list=i386-softmmu \ --target-list=i386-softmmu \
--enable-sdl \ --enable-sdl \
--with-sdlabi=2.0 \ --with-sdlabi=2.0 \
--disable-curl \ --disable-curl \
@ -60,6 +60,7 @@ set -x # Print commands from now on
--disable-libiscsi \ --disable-libiscsi \
--disable-spice \ --disable-spice \
--disable-user \ --disable-user \
--disable-stack-protector \
time make -j`nproc` 2>&1 | tee build.log time make -j`nproc` 2>&1 | tee build.log

16
hw/xbox/nv2a/nv2a_vsh.c
View File

@ -674,13 +674,25 @@ static const char* vsh_header =
"#define EXP(dest, mask, src) dest.mask = _EXP(_in(src).x).mask\n" "#define EXP(dest, mask, src) dest.mask = _EXP(_in(src).x).mask\n"
"vec4 _EXP(float src)\n" "vec4 _EXP(float src)\n"
"{\n" "{\n"
" return vec4(exp2(src));\n" " vec4 result;\n"
" result.x = exp2(floor(src));\n"
" result.y = src - floor(src);\n"
" result.z = exp2(src);\n"
" result.w = 1.0;\n"
" return result;\n"
"}\n" "}\n"
"\n" "\n"
"#define LOG(dest, mask, src) dest.mask = _LOG(_in(src).x).mask\n" "#define LOG(dest, mask, src) dest.mask = _LOG(_in(src).x).mask\n"
"vec4 _LOG(float src)\n" "vec4 _LOG(float src)\n"
"{\n" "{\n"
" return vec4(log2(src));\n" " float tmp = abs(src);\n"
" if (tmp == 0.0) { return vec4(-INFINITY, 1.0f, -INFINITY, 1.0f); }\n"
" vec4 result;\n"
" result.x = floor(log2(tmp));\n"
" result.y = tmp / exp2(floor(log2(tmp)));\n"
" result.z = log2(tmp);\n"
" result.w = 1.0;\n"
" return result;\n"
"}\n" "}\n"
"\n" "\n"
"#define LIT(dest, mask, src) dest.mask = _LIT(_in(src)).mask\n" "#define LIT(dest, mask, src) dest.mask = _LIT(_in(src)).mask\n"

11
hw/xbox/nvnet.c
View File

@ -28,6 +28,7 @@
#define IOPORT_SIZE 0x8 #define IOPORT_SIZE 0x8
#define MMIO_SIZE 0x400 #define MMIO_SIZE 0x400
// #define DEBUG
#ifdef DEBUG #ifdef DEBUG
# define NVNET_DPRINTF(format, ...) printf(format, ## __VA_ARGS__) # define NVNET_DPRINTF(format, ...) printf(format, ## __VA_ARGS__)
# define NVNET_DUMP_PACKETS_TO_SCREEN # define NVNET_DUMP_PACKETS_TO_SCREEN
@ -692,6 +693,7 @@ static ssize_t nvnet_dma_packet_from_guest(NvNetState *s)
struct RingDesc desc; struct RingDesc desc;
bool is_last_packet; bool is_last_packet;
int i; int i;
bool packet_sent = false;
for (i = 0; i < s->tx_ring_size; i++) { for (i = 0; i < s->tx_ring_size; i++) {
/* Read ring descriptor */ /* Read ring descriptor */
@ -716,6 +718,7 @@ static ssize_t nvnet_dma_packet_from_guest(NvNetState *s)
pci_dma_read(&s->dev, desc.packet_buffer, pci_dma_read(&s->dev, desc.packet_buffer,
s->txrx_dma_buf, desc.length + 1); s->txrx_dma_buf, desc.length + 1);
nvnet_send_packet(s, s->txrx_dma_buf, desc.length + 1); nvnet_send_packet(s, s->txrx_dma_buf, desc.length + 1);
packet_sent = true;
/* Update descriptor */ /* Update descriptor */
is_last_packet = desc.flags & NV_TX_LASTPACKET; is_last_packet = desc.flags & NV_TX_LASTPACKET;
@ -732,9 +735,11 @@ static ssize_t nvnet_dma_packet_from_guest(NvNetState *s)
} }
/* Trigger interrupt */ /* Trigger interrupt */
NVNET_DPRINTF("Triggering interrupt\n"); if (packet_sent) {
nvnet_set_reg(s, NvRegIrqStatus, NVREG_IRQSTAT_BIT4, 4); NVNET_DPRINTF("Triggering interrupt\n");
nvnet_update_irq(s); nvnet_set_reg(s, NvRegIrqStatus, NVREG_IRQSTAT_BIT4, 4);
nvnet_update_irq(s);
}
return 0; return 0;
} }