Cleanup register combiner code #16

JayFoxRox · 2018-08-13T00:15:43Z

No description provided.

JayFoxRox · 2018-08-13T11:22:24Z

hw/xbox/nv2a/nv2a_psh.c

-    if (qstring_get_length(ab_dest)) {
-        qstring_append_fmt(ps->code, "%s.%s = %s(%s);\n",
-                           qstring_get_str(ab_dest), write_mask, caster, qstring_get_str(ab_mapping));
+    if (ab_dest != NULL) {


This is a separate change

JayFoxRox · 2018-08-13T12:08:22Z

hw/xbox/nv2a/nv2a_psh.c

-    if (qstring_get_length(cd_dest)) {
-        qstring_append_fmt(ps->code, "%s.%s = %s(%s);\n",
-                           qstring_get_str(cd_dest), write_mask, caster, qstring_get_str(cd_mapping));
+    if (cd_dest != NULL) {


Rewrite this by checking PS_REGISTER_DISCARD directly for code clarity

JayFoxRox · 2018-08-13T18:00:36Z

hw/xbox/nv2a/nv2a_shaders.h

@@ -84,7 +84,7 @@ typedef struct ShaderBinding {
    GLuint gl_program;
    GLenum gl_primitive_mode;

-    GLint psh_constant_loc[9][2];
+    GLint psh_constant_loc[2][9];


JayFoxRox · 2018-08-13T18:01:51Z

hw/xbox/nv2a/nv2a_pgraph.c

@@ -2754,7 +2754,7 @@ static void pgraph_shader_update_constants(PGRAPHState *pg,
        }

        for (j = 0; j < 2; j++) {
-            GLint loc = binding->psh_constant_loc[i][j];
+            GLint loc = binding->psh_constant_loc[j][i];


With a Spice port chardev, it is possible to reenter monitor_qapi_event_queue() (when the client disconnects for example). This will dead-lock on monitor_lock. Instead, use some TLS variables to check for recursion and queue the events. Fixes: (gdb) bt #0 0x00007fa69e7217fd in __lll_lock_wait () at /lib64/libpthread.so.0 #1 0x00007fa69e71acf4 in pthread_mutex_lock () at /lib64/libpthread.so.0 #2 0x0000563303567619 in qemu_mutex_lock_impl (mutex=0x563303d3e220 <monitor_lock>, file=0x5633036589a8 "/home/elmarco/src/qq/monitor.c", line=645) at /home/elmarco/src/qq/util/qemu-thread-posix.c:66 #3 0x0000563302fa6c25 in monitor_qapi_event_queue (event=QAPI_EVENT_SPICE_DISCONNECTED, qdict=0x56330602bde0, errp=0x7ffc6ab5e728) at /home/elmarco/src/qq/monitor.c:645 #4 0x0000563303549aca in qapi_event_send_spice_disconnected (server=0x563305afd630, client=0x563305745360, errp=0x563303d8d0f0 <error_abort>) at qapi/qapi-events-ui.c:149 #5 0x00005633033e600f in channel_event (event=3, info=0x5633061b0050) at /home/elmarco/src/qq/ui/spice-core.c:235 #6 0x00007fa69f6c86bb in reds_handle_channel_event (reds=<optimized out>, event=3, info=0x5633061b0050) at reds.c:316 #7 0x00007fa69f6b193b in main_dispatcher_self_handle_channel_event (info=0x5633061b0050, event=3, self=0x563304e088c0) at main-dispatcher.c:197 #8 0x00007fa69f6b193b in main_dispatcher_channel_event (self=0x563304e088c0, event=event@entry=3, info=0x5633061b0050) at main-dispatcher.c:197 #9 0x00007fa69f6d0833 in red_stream_push_channel_event (s=s@entry=0x563305ad8f50, event=event@entry=3) at red-stream.c:414 #10 0x00007fa69f6d086b in red_stream_free (s=0x563305ad8f50) at red-stream.c:388 #11 0x00007fa69f6b7ddc in red_channel_client_finalize (object=0x563304df2360) at red-channel-client.c:347 #12 0x00007fa6a56b7fb9 in g_object_unref () at /lib64/libgobject-2.0.so.0 #13 0x00007fa69f6ba212 in red_channel_client_push (rcc=0x563304df2360) at red-channel-client.c:1341 #14 0x00007fa69f68b259 in red_char_device_send_msg_to_client (client=<optimized out>, msg=0x5633059b6310, dev=0x563304e08bc0) at char-device.c:305 #15 0x00007fa69f68b259 in red_char_device_send_msg_to_clients (msg=0x5633059b6310, dev=0x563304e08bc0) at char-device.c:305 #16 0x00007fa69f68b259 in red_char_device_read_from_device (dev=0x563304e08bc0) at char-device.c:353 #17 0x000056330317d01d in spice_chr_write (chr=0x563304cafe20, buf=0x563304cc50b0 "{\"timestamp\": {\"seconds\": 1532944763, \"microseconds\": 326636}, \"event\": \"SHUTDOWN\", \"data\": {\"guest\": false}}\r\n", len=111) at /home/elmarco/src/qq/chardev/spice.c:199 #18 0x00005633034deee7 in qemu_chr_write_buffer (s=0x563304cafe20, buf=0x563304cc50b0 "{\"timestamp\": {\"seconds\": 1532944763, \"microseconds\": 326636}, \"event\": \"SHUTDOWN\", \"data\": {\"guest\": false}}\r\n", len=111, offset=0x7ffc6ab5ea70, write_all=false) at /home/elmarco/src/qq/chardev/char.c:112 #19 0x00005633034df054 in qemu_chr_write (s=0x563304cafe20, buf=0x563304cc50b0 "{\"timestamp\": {\"seconds\": 1532944763, \"microseconds\": 326636}, \"event\": \"SHUTDOWN\", \"data\": {\"guest\": false}}\r\n", len=111, write_all=false) at /home/elmarco/src/qq/chardev/char.c:147 #20 0x00005633034e1e13 in qemu_chr_fe_write (be=0x563304dbb800, buf=0x563304cc50b0 "{\"timestamp\": {\"seconds\": 1532944763, \"microseconds\": 326636}, \"event\": \"SHUTDOWN\", \"data\": {\"guest\": false}}\r\n", len=111) at /home/elmarco/src/qq/chardev/char-fe.c:42 #21 0x0000563302fa6334 in monitor_flush_locked (mon=0x563304dbb800) at /home/elmarco/src/qq/monitor.c:425 #22 0x0000563302fa6520 in monitor_puts (mon=0x563304dbb800, str=0x563305de7e9e "") at /home/elmarco/src/qq/monitor.c:468 #23 0x0000563302fa680c in qmp_send_response (mon=0x563304dbb800, rsp=0x563304df5730) at /home/elmarco/src/qq/monitor.c:517 #24 0x0000563302fa6905 in qmp_queue_response (mon=0x563304dbb800, rsp=0x563304df5730) at /home/elmarco/src/qq/monitor.c:538 #25 0x0000563302fa6b5b in monitor_qapi_event_emit (event=QAPI_EVENT_SHUTDOWN, qdict=0x563304df5730) at /home/elmarco/src/qq/monitor.c:624 #26 0x0000563302fa6c4b in monitor_qapi_event_queue (event=QAPI_EVENT_SHUTDOWN, qdict=0x563304df5730, errp=0x7ffc6ab5ed00) at /home/elmarco/src/qq/monitor.c:649 #27 0x0000563303548cce in qapi_event_send_shutdown (guest=false, errp=0x563303d8d0f0 <error_abort>) at qapi/qapi-events-run-state.c:58 #28 0x000056330313bcd7 in main_loop_should_exit () at /home/elmarco/src/qq/vl.c:1822 #29 0x000056330313bde3 in main_loop () at /home/elmarco/src/qq/vl.c:1862 #30 0x0000563303143781 in main (argc=3, argv=0x7ffc6ab5f068, envp=0x7ffc6ab5f088) at /home/elmarco/src/qq/vl.c:4644 Note that error report is now moved to the first caller, which may receive an error for a recursed event. This is probably fine (95% of callers use &error_abort, the rest have NULL error and ignore it) Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20180731150144.14022-1-marcandre.lureau@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> [*_no_recurse renamed to *_no_reenter, local variables reordered] Signed-off-by: Markus Armbruster <armbru@redhat.com>

Set NV2A_CRYSTAL_FREQ to Retail speed Fix ptimer_get_clock() behaviour

* Port espes's fifo work to the split up nv2a code This patch ports over the following commits from the XQEMU 1.x tree (available via tag archive-xqemu-1.x) to the refactored nv2a code: - 4d9107e (HEAD -> xbox, upstream/xbox) Merge branch 'fix-fifo' into xbox - c33f4ab cleanups - d3f83d9 cleanups - faca5dd fix - 7c62d7c fixes - 8ad239b wip - 45ed3c3 wip - c006d5e wip However, in its current form, this patch causes some regressions and needs further investigation. * nv2a: basic pattern object

…rrect instruction emulation by QEMU hvf, which resulted in a ruined register that was not supposed to touch. + copy it over to target/i386 as well (for latest QEMU version) Change-Id: Ibdada114db8736560d41402d6af4042fc6e6c25b

Change-Id: I9d8d08d922eb08748b1535c628b08f27db3d5619 Fixes: 111676629

Change-Id: I26e116194e3fb2a5570bd2654e111307a14cc161 Signed-off-by: Haitao Shan <hshan@google.com>

If gpa is exactly the start address of one slot, the old code fails to find the slot. Change to use one byte range to find slot. Change-Id: I169ec8f759bb211a5ea7c693c5d99f27576c2e93 Signed-off-by: Tao Wu <lepton@google.com>

QEMU core will call this handler when a RAM block is removed (no surprises there), but it does _not_ check to see if this handler is non-NULL. Add a dummy handler for now.

Marking all pages as always dirty has some really bad consequences for the current NV2A emulation. The lesser of two evils for now is to leave the pages as-is. Eventually this will be replaced by proper dirty page tracking once HAXM supports it.

(with permission)

JayFoxRox · 2018-10-31T18:21:42Z

The history of this PR is fucked up.
I've renamed the branch and moved it to #21. This branch name was re-used for a PR that's upstream now.

PR comments must be moved from here, to #21.

JayFoxRox · 2018-11-06T21:02:08Z

Once the comments have been moved, this branch can be deleted. Upstream PR was merged.

dracc · 2020-02-08T17:53:45Z

As far as I understand, all comments have now landed in #21.

JayFoxRox force-pushed the psh-cleanup branch 5 times, most recently from e7dc6ac to 42f77f3 Compare August 13, 2018 11:21

JayFoxRox commented Aug 13, 2018

View reviewed changes

JayFoxRox force-pushed the psh-cleanup branch 2 times, most recently from f69331b to 6ee2433 Compare August 13, 2018 11:40

JayFoxRox changed the title ~~PSH Cleanup~~ Refactor register combiner code Aug 13, 2018

JayFoxRox force-pushed the psh-cleanup branch from 6ee2433 to 80c22f2 Compare August 13, 2018 11:57

JayFoxRox commented Aug 13, 2018

View reviewed changes

JayFoxRox force-pushed the psh-cleanup branch 3 times, most recently from 3a27846 to 8f27f59 Compare August 13, 2018 17:52

JayFoxRox commented Aug 13, 2018

View reviewed changes

JayFoxRox force-pushed the psh-cleanup branch 8 times, most recently from d81db1f to 8efac13 Compare August 14, 2018 01:08

JayFoxRox mentioned this pull request Aug 14, 2018

Fog-Hacks and other stuff #19

Open

JayFoxRox force-pushed the psh-cleanup branch from 8efac13 to 25577ea Compare August 14, 2018 22:12

dracc and others added 3 commits September 26, 2018 16:01

nv2a: Ptimer fixes (xqemu#113)

7960ffe

Set NV2A_CRYSTAL_FREQ to Retail speed Fix ptimer_get_clock() behaviour

cleanup xbox.c

3ee213e

espes and others added 9 commits September 26, 2018 17:42

cleanup nv2a

3d33d81

the rebase forgot the rtc fixes

022d50f

initial i386 hvf

2911dda

asan: hvf: fix overflow in decode struct

d0b4d29

Change-Id: I9d8d08d922eb08748b1535c628b08f27db3d5619 Fixes: 111676629

Fix emulator hang during adb reboot. Bug 69798912

e2fd7b2

Change-Id: I26e116194e3fb2a5570bd2654e111307a14cc161 Signed-off-by: Haitao Shan <hshan@google.com>

hvf: Fix bug that fails to find slot on border.

5edc406

If gpa is exactly the start address of one slot, the old code fails to find the slot. Change to use one byte range to find slot. Change-Id: I169ec8f759bb211a5ea7c693c5d99f27576c2e93 Signed-off-by: Tao Wu <lepton@google.com>

haxm: Add hax_ram_block_removed notify handler

71a4c6d

QEMU core will call this handler when a RAM block is removed (no surprises there), but it does _not_ check to see if this handler is non-NULL. Add a dummy handler for now.

JayFoxRox mentioned this pull request Sep 29, 2018

Extend scalar inputs in dotproducts to vec3 JayFoxRox/xqemu-espes#7

Closed

espes added 4 commits September 30, 2018 15:10

hvf: fix 2bl due to broken dirty tracking

8bf4872

hvf: refactor headers, fix gdbstub

d07438f

hvf: fix is_host_reg for i386

99cfb38

hvf: support PAT msr

7d500c4

JayFoxRox mentioned this pull request Oct 7, 2018

Halo: Combat Evolved weapon scope does not work. xqemu/xqemu#119

Closed

thrimbor and others added 7 commits October 8, 2018 11:34

Replace ffs() calls with ctz32()

1c6bb37

build.sh: allow out-of-tree builds

df2dc0c

relicense xbox components as LGPL

e12aa12

(with permission)

eeprom: Read EEPROM from file

6ecac32

build.sh: pass options, fix xqemu#114

9344483

psh: Rename c0 and c1 uniforms

a9fe69d

psh: Cleanup and dead code removal

a2b7310

JayFoxRox force-pushed the psh-cleanup branch from 25577ea to a2b7310 Compare October 31, 2018 17:17

JayFoxRox changed the title ~~Refactor register combiner code~~ Cleanup register combiner code Oct 31, 2018

JayFoxRox mentioned this pull request Oct 6, 2019

Register input swizzle test JayFoxRox/nxdk#30

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cleanup register combiner code #16

Cleanup register combiner code #16

JayFoxRox commented Aug 13, 2018 •

edited

Loading

JayFoxRox Aug 13, 2018 •

edited

Loading

JayFoxRox Aug 13, 2018

JayFoxRox Aug 13, 2018

JayFoxRox Aug 13, 2018

JayFoxRox commented Oct 31, 2018

JayFoxRox commented Nov 6, 2018

dracc commented Feb 8, 2020

Cleanup register combiner code #16

Are you sure you want to change the base?

Cleanup register combiner code #16

Conversation

JayFoxRox commented Aug 13, 2018 • edited Loading

JayFoxRox Aug 13, 2018 • edited Loading

Choose a reason for hiding this comment

JayFoxRox Aug 13, 2018

Choose a reason for hiding this comment

JayFoxRox Aug 13, 2018

Choose a reason for hiding this comment

JayFoxRox Aug 13, 2018

Choose a reason for hiding this comment

JayFoxRox commented Oct 31, 2018

JayFoxRox commented Nov 6, 2018

dracc commented Feb 8, 2020

JayFoxRox commented Aug 13, 2018 •

edited

Loading

JayFoxRox Aug 13, 2018 •

edited

Loading