<html>
<body>
<div id="body" style="background-color:#ffffff;" >
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head" style="border-bottom-width:1px;border-bottom-style:solid;" ><td class="headtd" style="padding:0;padding-top:.2em;" colspan="4">Commit in <b><tt>lxdream/src</tt></b></td></tr>
<tr><td><tt><a href="#file1">main.c</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+1</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-6</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">677b1d85f1b4 -> be02e87f9f87</td></tr>
<tr class="alt" style=";" ><td><tt>sh4/<a href="#file2">sh4.c</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+14</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-2</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">677b1d85f1b4 -> be02e87f9f87</td></tr>
<tr><td><tt> /<a href="#file3">sh4.h</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+12</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">677b1d85f1b4 -> be02e87f9f87</td></tr>
<tr class="alt" style=";" ><td><tt> /<a href="#file4">sh4core.h</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+1</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">677b1d85f1b4 -> be02e87f9f87</td></tr>
<tr><td><tt> /<a href="#file5">sh4trans.h</a></tt></td><td></td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-10</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">677b1d85f1b4 -> be02e87f9f87</td></tr>
<tr class="alt" style=";" ><td><tt> /<a href="#file6">sh4x86.in</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+1</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-13</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">677b1d85f1b4 -> be02e87f9f87</td></tr>
<tr><td></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+29</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-31</td><td></td></tr>
</table>
<small id="info" style="color: #888888;" >6 modified files</small><br />
<pre class="comment" style="white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;white-space:pre-wrap;word-wrap:break-word;padding:4px;border:1px dashed #000000;background-color:#ffffdd;" >
Move profile_block setting out of sh4x86 and back into sh4.c. Fix last bits
preventing non-translation build
</pre>
<hr /><a name="file1" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>main.c</b></big> <small id="info" style="color: #888888;" >677b1d85f1b4 -> be02e87f9f87</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/main.c
+++ lxdream/src/main.c
@@ -359,12 +359,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > }
sh4_set_core( sh4_core );
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-
-#ifdef SH4_TRANSLATOR
- if( sh4_core == SH4_TRANSLATE ) {
- sh4_translate_set_profile_blocks( sh4_profile_blocks );
- }
-#endif
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ sh4_set_profile_blocks( sh4_profile_blocks );
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
/* If requested, start the gdb server immediately before we go into the main
* loop.
</pre></div>
<hr /><a name="file2" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src/sh4</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>sh4.c</b></big> <small id="info" style="color: #888888;" >677b1d85f1b4 -> be02e87f9f87</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/sh4/sh4.c
+++ lxdream/src/sh4/sh4.c
@@ -148,6 +148,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > int sh4_breakpoint_count = 0;
gboolean sh4_starting = FALSE;
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+gboolean sh4_profile_blocks = FALSE;
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > static gboolean sh4_use_translator = FALSE;
static jmp_buf sh4_exit_jmp_buf;
static gboolean sh4_running = FALSE;
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -235,11 +236,12 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > /* If we were running with the translator, update new_pc and in_delay_slot */
sh4r.new_pc = sh4r.pc+2;
sh4r.in_delay_slot = FALSE;
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- if( sh4_translate_get_profile_blocks() ) {
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#ifdef SH4_TRANSLATOR
+ if( sh4_profile_blocks ) {
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > sh4_translate_dump_cache_by_activity(30);
}
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+#endif
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > }
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > }
/**
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -408,6 +410,16 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > sh4r.event_pending = cycles;
}
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+void sh4_set_profile_blocks( gboolean flag )
+{
+ sh4_profile_blocks = flag;
+}
+
+gboolean sh4_get_profile_blocks( )
+{
+ return sh4_profile_blocks;
+}
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > /**
* Dump all SH4 core information for crash-dump purposes
*/
</pre></div>
<hr /><a name="file3" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src/sh4</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>sh4.h</b></big> <small id="info" style="color: #888888;" >677b1d85f1b4 -> be02e87f9f87</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/sh4/sh4.h
+++ lxdream/src/sh4/sh4.h
@@ -151,6 +151,18 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > /** Dump a translated block with SH4 and target assembly side by side. */
void sh4_translate_dump_block( uint32_t pc );
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+/**
+ * Enable/disable basic block profiling (Note only supported by translation cores)
+ */
+void sh4_set_profile_blocks( gboolean flag );
+
+/**
+ * Get the boolean flag indicating whether block profiling is on.
+ */
+gboolean sh4_get_profile_blocks();
+
+
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > #ifdef __cplusplus
}
#endif
</pre></div>
<hr /><a name="file4" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src/sh4</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>sh4core.h</b></big> <small id="info" style="color: #888888;" >677b1d85f1b4 -> be02e87f9f87</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/sh4/sh4core.h
+++ lxdream/src/sh4/sh4core.h
@@ -33,6 +33,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > extern struct breakpoint_struct sh4_breakpoints[MAX_BREAKPOINTS];
extern int sh4_breakpoint_count;
extern gboolean sh4_starting;
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+extern gboolean sh4_profile_blocks;
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
/**
* Cached direct pointer to the current instruction page. If AT is on, this
</pre></div>
<hr /><a name="file5" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src/sh4</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>sh4trans.h</b></big> <small id="info" style="color: #888888;" >677b1d85f1b4 -> be02e87f9f87</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/sh4/sh4trans.h
+++ lxdream/src/sh4/sh4trans.h
@@ -103,16 +103,6 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > void sh4_translate_set_fastmem( gboolean flag );
/**
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- * Enable/disable basic block profiling
- */
-void sh4_translate_set_profile_blocks( gboolean flag );
-
-/**
- * Get the boolean flag indicating whether block profiling is on.
- */
-gboolean sh4_translate_get_profile_blocks();
-
-/**
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > * Set the address spaces for the translated code.
*/
void sh4_translate_set_address_space( struct mem_region_fn **priv, struct mem_region_fn **user );
</pre></div>
<hr /><a name="file6" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src/sh4</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>sh4x86.in</b></big> <small id="info" style="color: #888888;" >677b1d85f1b4 -> be02e87f9f87</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/sh4/sh4x86.in
+++ lxdream/src/sh4/sh4x86.in
@@ -106,7 +106,6 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > xlat_block_begin_callback_t begin_callback;
xlat_block_end_callback_t end_callback;
gboolean fastmem;
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- gboolean profile_blocks;
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
/* Allocated memory for the (block-wide) back-patch list */
struct backpatch_record *backpatch_list;
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -176,7 +175,6 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > sh4_x86.end_callback = NULL;
sh4_translate_set_address_space( sh4_address_space, sh4_user_address_space );
sh4_x86.fastmem = TRUE;
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- sh4_x86.profile_blocks = FALSE;
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > sh4_x86.sse3_enabled = is_sse3_supported();
x86_disasm_init();
x86_set_symtab( x86_symbol_table, sizeof(x86_symbol_table)/sizeof(struct x86_symbol) );
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -194,16 +192,6 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > sh4_x86.fastmem = flag;
}
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-void sh4_translate_set_profile_blocks( gboolean flag )
-{
- sh4_x86.profile_blocks = flag;
-}
-
-gboolean sh4_translate_get_profile_blocks()
-{
- return sh4_x86.profile_blocks;
-}
-
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > /**
* Disassemble the given translated code block, and it's source SH4 code block
* side-by-side. The current native pc will be marked if non-null.
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -522,7 +510,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > if( sh4_x86.begin_callback ) {
CALL_ptr( sh4_x86.begin_callback );
}
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- if( sh4_<span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >x86.</span>profile_blocks ) {
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ if( sh4_profile_blocks ) {
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > MOVP_immptr_rptr( sh4_x86.code + XLAT_ACTIVE_CODE_OFFSET, REG_EAX );
ADDL_imms_r32disp( 1, REG_EAX, 0 );
}
</pre></div>
<center><small>Chaos Theory</small></center>
</div></body></html>