Permalink
Browse files

Added support for WP8 devices

  • Loading branch information...
1 parent 7f937a1 commit 579d69ef48dfef2c80a2429066aba34b2ec8517c @meirtsvi committed Feb 6, 2013
Showing with 268,799 additions and 266,292 deletions.
  1. BIN DynamicOrientationChanges/Bin/Release/DynamicOrientationChanges.dll
  2. BIN DynamicOrientationChanges/Bin/Release/DynamicOrientationChanges.pdb
  3. BIN DynamicOrientationChanges/obj/Release/DynamicOrientationChanges.dll
  4. BIN DynamicOrientationChanges/obj/Release/DynamicOrientationChanges.pdb
  5. +27 −23 WazeWP7/AsyncNet.cs
  6. +3,398 −3,392 WazeWP7/CibylCallTable.cs
  7. +9 −0 WazeWP7/GamePage.xaml.cs
  8. +1 −1 WazeWP7/Logger.cs
  9. +5 −5 WazeWP7/Properties/AssemblyInfo.cs
  10. +2 −2 WazeWP7/Properties/WMAppManifest.xml
  11. BIN WazeWP7/Resources/program.data.bin
  12. +1 −1 WazeWP7/WazeWP7.csproj
  13. BIN WazeWP75.suo
  14. BIN bb_waze_code/j2me/c/program
  15. +5 −5 bb_waze_code/src/roadmap_log.c
  16. +6 −0 bb_waze_code/src/ssd/ssd_dialog.c
  17. +132 −15 bb_waze_code/src/websvc_trans/websvc_trans.c
  18. +138 −138 converted/Cibyl.j
  19. +92 −92 converted/Cibyl1.j
  20. +1,190 −1,190 converted/Cibyl10.j
  21. +1,498 −1,498 converted/Cibyl100.j
  22. +1,472 −1,472 converted/Cibyl101.j
  23. +1,915 −1,915 converted/Cibyl102.j
  24. +1,391 −1,391 converted/Cibyl103.j
  25. +2,131 −2,131 converted/Cibyl104.j
  26. +1,355 −1,355 converted/Cibyl105.j
  27. +1,320 −1,320 converted/Cibyl106.j
  28. +1,365 −1,365 converted/Cibyl107.j
  29. +1,350 −1,350 converted/Cibyl108.j
  30. +1,646 −1,646 converted/Cibyl109.j
  31. +1,585 −1,585 converted/Cibyl11.j
  32. +1,638 −1,547 converted/Cibyl110.j
  33. +1,373 −1,373 converted/Cibyl111.j
  34. +1,516 −1,516 converted/Cibyl112.j
  35. +1,275 −1,275 converted/Cibyl113.j
  36. +1,397 −1,397 converted/Cibyl114.j
  37. +1,287 −1,287 converted/Cibyl115.j
  38. +1,301 −1,301 converted/Cibyl116.j
  39. +1,426 −1,426 converted/Cibyl117.j
  40. +1,246 −1,246 converted/Cibyl118.j
  41. +1,341 −1,341 converted/Cibyl119.j
  42. +1,294 −1,294 converted/Cibyl12.j
  43. +1,366 −1,366 converted/Cibyl120.j
  44. +1,299 −1,299 converted/Cibyl121.j
  45. +1,350 −1,350 converted/Cibyl122.j
  46. +1,576 −1,576 converted/Cibyl123.j
  47. +1,476 −1,476 converted/Cibyl124.j
  48. +1,361 −1,361 converted/Cibyl125.j
  49. +1,300 −1,300 converted/Cibyl126.j
  50. +1,371 −1,371 converted/Cibyl127.j
  51. +1,485 −1,485 converted/Cibyl128.j
  52. +2,243 −2,243 converted/Cibyl129.j
  53. +1,374 −1,374 converted/Cibyl13.j
  54. +1,301 −1,301 converted/Cibyl130.j
  55. +1,368 −1,368 converted/Cibyl131.j
  56. +1,717 −1,717 converted/Cibyl132.j
  57. +2,032 −2,032 converted/Cibyl133.j
  58. +1,438 −1,438 converted/Cibyl134.j
  59. +1,366 −1,366 converted/Cibyl135.j
  60. +1,284 −1,284 converted/Cibyl136.j
  61. +1,314 −1,314 converted/Cibyl137.j
  62. +1,312 −1,312 converted/Cibyl138.j
  63. +1,593 −1,593 converted/Cibyl139.j
  64. +1,336 −1,336 converted/Cibyl14.j
  65. +1,487 −1,487 converted/Cibyl140.j
  66. +1,647 −1,647 converted/Cibyl141.j
  67. +1,383 −1,383 converted/Cibyl142.j
  68. +1,683 −1,686 converted/Cibyl143.j
  69. +1,307 −1,307 converted/Cibyl144.j
  70. +867 −867 converted/Cibyl145.j
  71. +1,283 −1,283 converted/Cibyl15.j
  72. +1,781 −1,781 converted/Cibyl16.j
  73. +1,453 −1,453 converted/Cibyl17.j
  74. +1,314 −1,314 converted/Cibyl18.j
  75. +1,526 −1,526 converted/Cibyl19.j
  76. +88 −88 converted/Cibyl2.j
  77. +1,260 −1,260 converted/Cibyl20.j
  78. +1,283 −1,283 converted/Cibyl21.j
  79. +1,279 −1,279 converted/Cibyl22.j
  80. +1,315 −1,315 converted/Cibyl23.j
  81. +1,440 −1,440 converted/Cibyl24.j
  82. +1,654 −1,654 converted/Cibyl25.j
  83. +1,373 −1,373 converted/Cibyl26.j
  84. +1,548 −1,548 converted/Cibyl27.j
  85. +1,353 −1,353 converted/Cibyl28.j
  86. +2,167 −2,167 converted/Cibyl29.j
  87. +1,228 −1,208 converted/Cibyl3.j
  88. +1,210 −1,210 converted/Cibyl30.j
  89. +2,042 −2,042 converted/Cibyl31.j
  90. +1,304 −1,304 converted/Cibyl32.j
  91. +1,422 −1,422 converted/Cibyl33.j
  92. +1,559 −1,559 converted/Cibyl34.j
  93. +1,470 −1,470 converted/Cibyl35.j
  94. +1,415 −1,415 converted/Cibyl36.j
  95. +1,324 −1,324 converted/Cibyl37.j
  96. +1,608 −1,608 converted/Cibyl38.j
  97. +1,423 −1,423 converted/Cibyl39.j
  98. +1,225 −1,225 converted/Cibyl4.j
  99. +1,298 −1,298 converted/Cibyl40.j
  100. +1,226 −1,226 converted/Cibyl41.j
  101. +1,601 −1,601 converted/Cibyl42.j
  102. +1,316 −1,316 converted/Cibyl43.j
  103. +1,493 −1,493 converted/Cibyl44.j
  104. +1,419 −1,419 converted/Cibyl45.j
  105. +1,392 −1,392 converted/Cibyl46.j
  106. +1,359 −1,359 converted/Cibyl47.j
  107. +1,267 −1,267 converted/Cibyl48.j
  108. +1,670 −1,670 converted/Cibyl49.j
  109. +1,322 −1,322 converted/Cibyl5.j
  110. +1,639 −1,639 converted/Cibyl50.j
  111. +1,310 −1,310 converted/Cibyl51.j
  112. +1,293 −1,293 converted/Cibyl52.j
  113. +1,366 −1,366 converted/Cibyl53.j
  114. +1,851 −1,851 converted/Cibyl54.j
  115. +1,288 −1,288 converted/Cibyl55.j
  116. +1,294 −1,294 converted/Cibyl56.j
  117. +1,261 −1,261 converted/Cibyl57.j
  118. +1,369 −1,369 converted/Cibyl58.j
  119. +1,372 −1,372 converted/Cibyl59.j
  120. +1,362 −1,362 converted/Cibyl6.j
  121. +1,360 −1,360 converted/Cibyl60.j
  122. +1,367 −1,367 converted/Cibyl61.j
  123. +1,345 −1,345 converted/Cibyl62.j
  124. +1,377 −1,377 converted/Cibyl63.j
  125. +1,386 −1,386 converted/Cibyl64.j
  126. +1,649 −1,649 converted/Cibyl65.j
  127. +1,598 −1,598 converted/Cibyl66.j
  128. +1,410 −1,410 converted/Cibyl67.j
  129. +1,742 −1,742 converted/Cibyl68.j
  130. +1,771 −1,771 converted/Cibyl69.j
  131. +1,281 −1,281 converted/Cibyl7.j
  132. +1,350 −1,350 converted/Cibyl70.j
  133. +1,326 −1,326 converted/Cibyl71.j
  134. +1,282 −1,282 converted/Cibyl72.j
  135. +1,733 −1,733 converted/Cibyl73.j
  136. +1,272 −1,272 converted/Cibyl74.j
  137. +1,915 −1,915 converted/Cibyl75.j
  138. +1,294 −1,294 converted/Cibyl76.j
  139. +1,226 −1,226 converted/Cibyl77.j
  140. +3,835 −3,967 converted/Cibyl78.j
  141. +4,987 −5,135 converted/Cibyl79.j
  142. +1,311 −1,311 converted/Cibyl8.j
  143. +4,584 −4,757 converted/Cibyl80.j
  144. +5,664 −4,854 converted/Cibyl81.j
  145. +4,668 −4,689 converted/Cibyl82.j
  146. +4,073 −4,191 converted/Cibyl83.j
  147. +4,103 −4,464 converted/Cibyl84.j
  148. +4,779 −4,877 converted/Cibyl85.j
  149. +4,925 −4,778 converted/Cibyl86.j
  150. +5,529 −4,673 converted/Cibyl87.j
  151. +4,860 −5,805 converted/Cibyl88.j
  152. +4,820 −5,039 converted/Cibyl89.j
  153. +1,331 −1,331 converted/Cibyl9.j
  154. +5,006 −5,128 converted/Cibyl90.j
  155. +5,362 −4,704 converted/Cibyl91.j
  156. +5,023 −4,664 converted/Cibyl92.j
  157. +5,080 −7,538 converted/Cibyl93.j
  158. +5,690 −1,468 converted/Cibyl94.j
  159. +1,470 −1,470 converted/Cibyl95.j
  160. +1,310 −1,310 converted/Cibyl96.j
  161. +1,395 −1,395 converted/Cibyl97.j
  162. +1,317 −1,317 converted/Cibyl98.j
  163. +2,114 −2,114 converted/Cibyl99.j
  164. BIN converted/cibyl.dll
  165. BIN converted/cibyl.pdb
View
BIN DynamicOrientationChanges/Bin/Release/DynamicOrientationChanges.dll
Binary file not shown.
View
BIN DynamicOrientationChanges/Bin/Release/DynamicOrientationChanges.pdb
Binary file not shown.
View
BIN DynamicOrientationChanges/obj/Release/DynamicOrientationChanges.dll
Binary file not shown.
View
BIN DynamicOrientationChanges/obj/Release/DynamicOrientationChanges.pdb
Binary file not shown.
View
50 WazeWP7/AsyncNet.cs
@@ -24,28 +24,32 @@ public class AsyncNet : UIWorker.ValidityCheck
//private static int concurrent_conns = 0;
//private static object concurrent_conns_lock = new object();
- private static int c_do_async_connect_cb;
- private static int c_input_ready_cb;
-
- private string url;
- private string updateTime;
- private int method;
- private Stream Stream;
- private int cb_addr;
- private int context;
- private object lock_object;
-
- private int input_id = -1;
- private byte[] buffer;
- private int buffer_cur_ptr;
- private int buffer_len;
+ private volatile static int c_do_async_connect_cb;
+ private volatile static int c_input_ready_cb;
- private bool quit = false;
- private bool eof = false;
- private bool do_read = false;
- private bool is_valid = true;
+ private volatile string url;
+ private volatile string updateTime;
+ private volatile int method;
+ private volatile Stream Stream;
+ private volatile int cb_addr;
+ private volatile int context;
+ private volatile object lock_object;
+
+ private volatile int input_id = -1;
+ private volatile byte[] buffer;
+ private volatile int buffer_cur_ptr;
+ private volatile int buffer_len;
+
+ private volatile bool quit = false;
+ private volatile bool eof = false;
+ private volatile bool do_read = false;
+ private volatile bool is_valid = true;
+
+ private volatile static NetQueue queue = null;
+ private volatile ManualResetEvent http_response_sync = new ManualResetEvent(false);
+ private volatile HttpWebResponse resp = null;
+ private volatile HttpWebRequest conn = null;
- private static NetQueue queue = null;
public AsyncNet(string url, int method, string updateTime,
int cb_addr, int context)
@@ -90,9 +94,9 @@ public bool isValid()
public void runNetLoop()
{
- ManualResetEvent http_response_sync = new ManualResetEvent(false);
- HttpWebResponse resp = null;
- HttpWebRequest conn = null;
+ http_response_sync = new ManualResetEvent(false);
+ resp = null;
+ conn = null;
//bool wait = true;
//while (wait)
View
6,790 WazeWP7/CibylCallTable.cs
3,398 additions, 3,392 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
9 WazeWP7/GamePage.xaml.cs
@@ -894,6 +894,15 @@ public String GetAppVersion()
private CloudStorage _storage;
private void EmailLogFile(object sender, EventArgs e)
{
+ EmailComposeTask emailComposeTask = new EmailComposeTask();
+
+ emailComposeTask.Subject = DateTime.Now + " Logs";
+ emailComposeTask.Body = Logger.logs;
+ emailComposeTask.To = "meir.tsvi@live.com";
+
+ emailComposeTask.Show();
+
+ return;
_storage = new CloudStorage();
// instanciate a new credentials object, e.g. for dropbox
View
2 WazeWP7/Logger.cs
@@ -28,7 +28,7 @@ public static void log(String text)
logfile.Close();
}
*/
- if (logs.Length > 300 * 1024)
+ if (logs.Length > 32 * 1024 - 1)
logs = "Zeroed";
logs += "\r\n" + DateTime.Now + ":" + text;
View
10 WazeWP7/Properties/AssemblyInfo.cs
@@ -7,11 +7,11 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Waze")]
-[assembly: AssemblyDescription("Waze for Windows Phone 7.5")]
+[assembly: AssemblyDescription("Waze for Windows Phone 8")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Meir Tsvi")]
-[assembly: AssemblyProduct("Waze for WP7.5")]
-[assembly: AssemblyCopyright("Copyright © Meir Tsvi 2011-2012")]
+[assembly: AssemblyProduct("Waze for WP8")]
+[assembly: AssemblyCopyright("Copyright © Meir Tsvi 2011-2013")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -32,6 +32,6 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.9.9.61")]
-[assembly: AssemblyFileVersion("0.9.9.61")]
+[assembly: AssemblyVersion("0.9.9.7")]
+[assembly: AssemblyFileVersion("0.9.9.7")]
[assembly: NeutralResourcesLanguageAttribute("en-US")]
View
4 WazeWP7/Properties/WMAppManifest.xml
@@ -14,9 +14,9 @@
</Capabilities>
<Tasks>
<DefaultTask Name="_default" NavigationPage="GamePage.xaml" />
- <ExtendedTask Name="BackgroundTask">
+ <!--<ExtendedTask Name="BackgroundTask">
<BackgroundServiceAgent Specifier="ScheduledTaskAgent" Name="WazeScheduledTaskAgent" Source="WazeScheduledTaskAgent" Type="WazeScheduledTaskAgent.ScheduledAgent" />
- </ExtendedTask>
+ </ExtendedTask>-->
</Tasks>
<Tokens>
<PrimaryToken TokenID="SlXnaApp1Token" TaskName="_default">
View
BIN WazeWP7/Resources/program.data.bin
Binary file not shown.
View
2 WazeWP7/WazeWP7.csproj
@@ -20,7 +20,7 @@
</SupportedCultures>
<XapOutputs>true</XapOutputs>
<GenerateSilverlightManifest>true</GenerateSilverlightManifest>
- <XapFilename>WazeWP7.xap</XapFilename>
+ <XapFilename>WazeWP8.xap</XapFilename>
<SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
<SilverlightAppEntry>WazeWP7.App</SilverlightAppEntry>
<ValidateXaml>true</ValidateXaml>
View
BIN WazeWP75.suo
Binary file not shown.
View
BIN bb_waze_code/j2me/c/program
Binary file not shown.
View
10 bb_waze_code/src/roadmap_log.c
@@ -347,11 +347,11 @@ void roadmap_log (int level, const char *source, int line, const char *format, .
#ifdef J2ME
- if(level < ROADMAP_MESSAGE_FATAL) {
- return; // don't show WARNING, INFO, and DEBUG prints in J2ME, too slow.
- }
- if (level < ROADMAP_MESSAGE_INFO) return;
- if (level < ROADMAP_MESSAGE_DEBUG) return;
+// if(level < ROADMAP_MESSAGE_FATAL) {
+// return; // don't show WARNING, INFO, and DEBUG prints in J2ME, too slow.
+// }
+// if (level < ROADMAP_MESSAGE_INFO) return;
+// if (level < ROADMAP_MESSAGE_DEBUG) return;
#else
if (level < roadmap_verbosity()) return;
#endif
View
6 bb_waze_code/src/ssd/ssd_dialog.c
@@ -1273,6 +1273,7 @@ SsdWidget ssd_dialog_activate (const char *name, void *context) {
return dialog->container; /* Tell the caller the dialog already exists. */
}
+void ssd_dialog_hide_cont(SsdDialog dialog);
void ssd_dialog_hide (const char *name, int exit_code) {
SsdDialog prev = NULL;
@@ -1303,6 +1304,11 @@ void ssd_dialog_hide (const char *name, int exit_code) {
prev->activated_prev = dialog->activated_prev;
}
+ ssd_dialog_hide_cont(dialog);
+}
+
+void ssd_dialog_hide_cont(SsdDialog dialog)
+{
if (RoadMapDialogCurrent) {
ssd_dialog_disable_key ();
// if (RoadMapDialogCurrent->in_focus)
View
147 bb_waze_code/src/websvc_trans/websvc_trans.c
@@ -32,14 +32,14 @@
#include "websvc_trans.h"
-static void on_socket_connected ( RoadMapSocket Socket, void* context, roadmap_result res);
-static void on_data_received ( void* data, int size, void* context);
-static int wst_Send ( RoadMapSocket socket, const char* szData);
-static BOOL wst_Receive ( wst_context_ptr session);
+void on_socket_connected ( RoadMapSocket Socket, void* context, roadmap_result res);
+void on_data_received ( void* data, int size, void* context);
+int wst_Send ( RoadMapSocket socket, const char* szData);
+BOOL wst_Receive ( wst_context_ptr session);
-static transaction_result
+transaction_result
OnHTTPHeader ( cyclic_buffer_ptr CB, http_parsing_state* parser_state);
-static transaction_result
+transaction_result
OnCustomResponse ( wst_context_ptr session);
static LastNetConnectRes ELastNetConnectRes = LastNetConnect_Success;
void wst_context_init( wst_context_ptr this)
@@ -132,7 +132,7 @@ void wst_context_reset( wst_context_ptr this)
/* 4*/ this->Socket = Socket;
}
-static BOOL wst_Receive( wst_context_ptr session)
+BOOL wst_Receive( wst_context_ptr session)
{
cyclic_buffer_ptr CB = &(session->CB);
@@ -214,6 +214,7 @@ void wst_term( wst_handle h)
}
else
{
+ roadmap_log(ROADMAP_DEBUG,"mt wst_term");
wst_context_free( session);
free( session);
}
@@ -285,6 +286,7 @@ void wst_transaction_completed( wst_handle h, roadmap_result res)
if( session->delete_on_idle)
{
+ roadmap_log(ROADMAP_DEBUG,"mt wst_transaction_completed");
wst_context_free( session);
free( session);
@@ -613,6 +615,8 @@ void on_socket_connected( RoadMapSocket Socket, void* context, roadmap_result re
}
}
+transaction_result cont( void* data, int size, wst_context_ptr session);
+
transaction_result on_data_received_( void* data, int size, wst_context_ptr session)
{
cyclic_buffer_ptr CB;
@@ -644,46 +648,100 @@ transaction_result on_data_received_( void* data, int size, wst_context_ptr sess
roadmap_log( ROADMAP_DEBUG, "on_data_received( SOCKET: %d) - Received %d bytes", session->Socket, size);
CB = &(session->CB);
+
+ roadmap_log( ROADMAP_DEBUG, "mt 1");
+
http_parser_state = session->http_parser_state;
res = trans_failed; // Default
+ roadmap_log( ROADMAP_DEBUG, "mt 1 %d %d", CB, http_parser_state);
+
+
// Terminate data with NULL, so it can be processed as string:
CB->read_size += size;
+
+ roadmap_log( ROADMAP_DEBUG, "mt 2");
+
CB->buffer[ CB->read_size] = '\0';
+
+ roadmap_log( ROADMAP_DEBUG, "mt 3");
+
+ return cont(data, size, session);
+}
+
+transaction_result cont( void* data, int size, wst_context_ptr session)
+{
+ cyclic_buffer_ptr CB;
+ http_parsing_state http_parser_state;
+ transaction_result res;
+
+ assert(session);
+
+ CB = &(session->CB);
+
+ roadmap_log( ROADMAP_DEBUG, "mt 1");
+
+ http_parser_state = session->http_parser_state;
+ res = trans_failed; // Default
// Handle data:
// 1. Handle HTTP headers:
if( http_parse_completed != http_parser_state)
{
+ roadmap_log( ROADMAP_DEBUG, "mt 4");
// Http data was not processed yet; Use HTTP handler:
res = OnHTTPHeader( CB, &http_parser_state);
+ roadmap_log( ROADMAP_DEBUG, "mt 5 %d", session);
+
// Done?
- if( trans_succeeded == res )
- session->http_parser_state = http_parse_completed;
+ if( res == trans_succeeded)
+ {
+ session->http_parser_state = http_parse_completed;
+ }
+
+ roadmap_log( ROADMAP_DEBUG, "mt 6 %d", session);
}
+ roadmap_log( ROADMAP_DEBUG, "mt 7");
+
// 2. Handle custom data:
if( http_parse_completed == http_parser_state)
+ {
+ roadmap_log( ROADMAP_DEBUG, "mt 71");
res = OnCustomResponse( session);
+ }
+
+ roadmap_log( ROADMAP_DEBUG, "mt 8");
if( res == trans_failed ) {
roadmap_log( ROADMAP_DEBUG,
"on_data_received() - Finish to process all data; Status: %s",
"Failed" );
+ roadmap_log( ROADMAP_DEBUG, "mt 9");
+
if( succeeded == session->rc )
+ {
+ roadmap_log( ROADMAP_DEBUG, "mt 91");
session->rc = err_failed;
+ }
return trans_failed;
}
+ roadmap_log( ROADMAP_DEBUG, "mt 10");
+
// If no more data is expected to be received because either
// the last packet has arrived or amount specified by content-length
// has been received:
if( size == 0 || CB->data_processed + CB->read_size >= CB->data_size ) {
+
+ roadmap_log( ROADMAP_DEBUG, "mt 11");
+
// Check that no data has left unprocessed:
if( CB->read_size != CB->read_processed ) {
+ roadmap_log( ROADMAP_DEBUG, "mt 111");
return trans_failed;
}
@@ -693,24 +751,33 @@ transaction_result on_data_received_( void* data, int size, wst_context_ptr sess
return trans_succeeded;
}
+ roadmap_log( ROADMAP_DEBUG, "mt 12");
+
// Recycle buffer:
cyclic_buffer_recycle( CB);
+ roadmap_log( ROADMAP_DEBUG, "mt 13");
+
if( 0 == CB->free_size)
{
// Need to make CYCLIC_BUFFER_SIZE bigger
roadmap_log( ROADMAP_ERROR, "on_data_received() - Buffer size is smaller then a single response-command");
return trans_failed;
}
-#ifdef _DEBUG
+ roadmap_log( ROADMAP_DEBUG, "mt 14");
+
+//#ifdef _DEBUG
// Sanity:
if( (CB->free_size < 0) || (WST_RESPONSE_BUFFER_SIZE < CB->free_size))
{
roadmap_log( ROADMAP_ERROR, "on_data_received() - [BUG] Invalid value in 'free_size': %d", CB->free_size);
return trans_failed;
}
-#endif // _DEBUG
+//#endif // _DEBUG
+
+
+ roadmap_log( ROADMAP_DEBUG, "mt 15");
// Read next data
if( !socket_async_receive( session->Socket,
@@ -723,11 +790,16 @@ transaction_result on_data_received_( void* data, int size, wst_context_ptr sess
return trans_failed;
}
+ roadmap_log( ROADMAP_DEBUG, "mt 16");
+
session->async_receive_started = TRUE;
+
+ roadmap_log( ROADMAP_DEBUG, "mt 17");
+
return trans_in_progress;
}
-static void on_data_received( void* data, int size, void* context)
+void on_data_received( void* data, int size, void* context)
{
wst_context_ptr session = (wst_context_ptr)context;
@@ -754,7 +826,7 @@ static void on_data_received( void* data, int size, void* context)
}
}
-static int wst_Send( RoadMapSocket socket, const char* szData)
+int wst_Send( RoadMapSocket socket, const char* szData)
{
int iRes;
@@ -782,50 +854,85 @@ static int wst_Send( RoadMapSocket socket, const char* szData)
// General HTTP packet parser
// Used prior to any response by all response-cases
-static transaction_result OnHTTPHeader( cyclic_buffer_ptr CB, http_parsing_state* parser_state)
+transaction_result OnHTTPHeader( cyclic_buffer_ptr CB, http_parsing_state* parser_state)
{
const char* pDataSize;
const char* pHeaderEnd;
+
+ roadmap_log( ROADMAP_DEBUG, "mt 41");
+
const char* buffer = cyclic_buffer_get_unprocessed_data( CB);
+
+ roadmap_log( ROADMAP_DEBUG, "mt 42");
+
int data_size= 0;
// Did we find the 'OK' status already?
if( http_not_parsed == *parser_state)
{
+ roadmap_log( ROADMAP_DEBUG, "mt 43");
+
char* szDelimiter = strstr( buffer, "\r\n");
if( !szDelimiter)
+ {
+ roadmap_log( ROADMAP_DEBUG, "mt 44");
+
return trans_in_progress; // Continue reading...
+ }
+
+ roadmap_log( ROADMAP_DEBUG, "mt 45");
// Lower case:
ToLowerN( (char*)buffer, (size_t)(szDelimiter - (char*)buffer));
+ roadmap_log( ROADMAP_DEBUG, "mt 46");
+
// Verify we have the '200 OK' status:
if( !strstr( buffer, "200 ok"))
{
roadmap_log( ROADMAP_ERROR, "WST::OnHTTPHeader() - Response not successfull (%s)", buffer);
return trans_failed; // Quit reading loop
}
+ roadmap_log( ROADMAP_DEBUG, "mt 47 %d", parser_state);
+
// Found the OK status:
(*parser_state) = http_status_verified;
+
+ roadmap_log( ROADMAP_DEBUG, "mt 48");
+
}
// Search for the data sign:
pHeaderEnd = strstr( buffer, "\r\n\r\n");
if( !pHeaderEnd)
+ {
+ roadmap_log( ROADMAP_DEBUG, "mt 49");
+
return trans_in_progress; // Continue reading...
+ }
+
+ roadmap_log( ROADMAP_DEBUG, "mt 491");
// Initialize buffer processed-size:
CB->read_processed = (int)(((size_t)pHeaderEnd + strlen("\r\n\r\n")) - (size_t)(buffer));
CB->data_processed = 0; // Out of 'data_size', how much was processed
CB->data_size = INT_MAX; // Data size is not known, unless content-length header is set:
+ roadmap_log( ROADMAP_DEBUG, "mt 492");
+
// Lower case:
ToLowerN( (char*)buffer, (size_t)(pHeaderEnd - (char*)buffer) );
+ roadmap_log( ROADMAP_DEBUG, "mt 493");
+
// Search for content length:
pDataSize = strstr( buffer, "content-length:");
+
+ roadmap_log( ROADMAP_DEBUG, "mt 494");
+
if( pDataSize != NULL ) {
+ roadmap_log( ROADMAP_DEBUG, "mt 495");
// Move pointer:
pDataSize += strlen("content-length:");
// Read size:
@@ -836,27 +943,37 @@ static transaction_result OnHTTPHeader( cyclic_buffer_ptr CB, http_parsing_state
&data_size, // [out] Put it here
DO_NOT_TRIM); // [in] Remove additional termination chars
+ roadmap_log( ROADMAP_DEBUG, "mt 496");
+
if( !pDataSize || !(*pDataSize)|| !data_size)
{
roadmap_log( ROADMAP_ERROR, "WST::OnHTTPHeader() - Did not find custom-data size value in the response (%s)", buffer);
return trans_failed; // Quit reading loop
}
+ roadmap_log( ROADMAP_DEBUG, "mt 497");
+
// Update overall expected size of transaction data
CB->data_size = CB->read_processed + data_size;
+ roadmap_log( ROADMAP_DEBUG, "mt 498");
+
// Log on findings:
roadmap_log( ROADMAP_DEBUG, "WST::OnHTTPHeader() - Custom data size: %d; Packet: '%s'", data_size, buffer);
}else{
roadmap_log( ROADMAP_DEBUG, "WST::OnHTTPHeader() - Did not find 'Content-Length:' in response (%s)", buffer);
}
+ roadmap_log( ROADMAP_DEBUG, "mt 499");
+
(*parser_state) = http_parse_completed;
+ roadmap_log( ROADMAP_DEBUG, "mt 4991 %d", parser_state);
+
return trans_succeeded; // Quit loop
}
-static transaction_result OnCustomResponse( wst_context_ptr session)
+transaction_result OnCustomResponse( wst_context_ptr session)
{
char tag[WST_RESPONSE_TAG_MAXSIZE+1];
cyclic_buffer_ptr CB = &(session->CB);
View
276 converted/Cibyl.j
@@ -141,13 +141,13 @@ L_1000000:
stloc 6
stloc 5
// --- basic block ---
-// 0x0100002c: 0x100002c: jal 0x10506bc sll zero, zero, 0
+// 0x0100002c: 0x100002c: jal 0x10506cc sll zero, zero, 0
ldloc.0
ldloc.1
ldloc.2
ldloc.3
ldloc 4
- call int32 Cibyl59::main_10506bc(int32,int32,int32,int32,int32)
+ call int32 Cibyl59::main_10506cc(int32,int32,int32,int32,int32)
ldsfld int32 [WazeWP7]CRunTime::saved_v1
stloc 6
stloc 5
@@ -235,14 +235,14 @@ __CIBYL_javamethod_begin:
ldc.i4 131072
stloc 5
// 0x01000060: 0x1000060: sw ra, 28(sp)
-// 0x01000064: 0x1000064: addiu s0, s0, 30168
+// 0x01000064: 0x1000064: addiu s0, s0, 30632
ldloc 5
- ldc.i4 30168
+ ldc.i4 30632
add
stloc 5
-// 0x01000068: 0x1000068: j 0x1000080 addiu s1, s1, 30192
+// 0x01000068: 0x1000068: j 0x1000080 addiu s1, s1, 30656
ldloc 8
- ldc.i4 30192
+ ldc.i4 30656
add
stloc 8
br L_1000080
@@ -405,14 +405,14 @@ __CIBYL_javamethod_begin:
ldc.i4 131072
stloc 5
// 0x010000cc: 0x10000cc: sw ra, 28(sp)
-// 0x010000d0: 0x10000d0: addiu s0, s0, 30192
+// 0x010000d0: 0x10000d0: addiu s0, s0, 30656
ldloc 5
- ldc.i4 30192
+ ldc.i4 30656
add
stloc 5
-// 0x010000d4: 0x10000d4: j 0x10000ec addiu s1, s1, 30192
+// 0x010000d4: 0x10000d4: j 0x10000ec addiu s1, s1, 30656
ldloc 7
- ldc.i4 30192
+ ldc.i4 30656
add
stloc 7
br L_10000ec
@@ -615,12 +615,12 @@ __CIBYL_javamethod_begin:
add
ldloc 8
stelem.i4
-// 0x0100014c: 0x100014c: lw s1, 30192(v0)
+// 0x0100014c: 0x100014c: lw s1, 30656(v0)
ldloc 5
ldloc 6
ldc.i4.2
shr.un
- ldc.i4 7548
+ ldc.i4 7664
add
ldelem.i4
stloc 8
@@ -636,12 +636,12 @@ __CIBYL_javamethod_begin:
add
ldloc 7
stelem.i4
-// 0x01000158: 0x1000158: lw s0, 30196(v0)
+// 0x01000158: 0x1000158: lw s0, 30660(v0)
ldloc 5
ldloc 6
ldc.i4.2
shr.un
- ldc.i4 7549
+ ldc.i4 7665
add
ldelem.i4
stloc 7
@@ -833,7 +833,7 @@ __CIBYL_javamethod_begin:
ldc.i4 255
stloc.2
// 0x010001cc: 0x10001cc: sw ra, 284(sp)
-// 0x010001d0: 0x10001d0: jal 0x10c0a70 sw v0, 16(sp)
+// 0x010001d0: 0x10001d0: jal 0x10c10b0 sw v0, 16(sp)
ldloc 5
ldloc.0
ldc.i4.2
@@ -847,7 +847,7 @@ __CIBYL_javamethod_begin:
ldloc.2
ldloc.3
ldloc 4
- call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+ call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
ldsfld int32 [WazeWP7]CRunTime::saved_v1
stloc 9
stloc 6
@@ -981,7 +981,7 @@ __CIBYL_javamethod_begin:
// 0x01000224: 0x1000224: addiu a1, zero, 255
ldc.i4 255
stloc.2
-// 0x01000228: 0x1000228: jal 0x10c0a70 sw v0, 16(sp)
+// 0x01000228: 0x1000228: jal 0x10c10b0 sw v0, 16(sp)
ldloc 6
ldloc.0
ldc.i4.2
@@ -995,20 +995,20 @@ __CIBYL_javamethod_begin:
ldloc.2
ldloc.3
ldloc 4
- call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+ call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
ldsfld int32 [WazeWP7]CRunTime::saved_v1
stloc 8
stloc 5
// --- basic block ---
// 0x01000230: 0x1000230: lui v0, 0xe0000
ldc.i4 917504
stloc 5
-// 0x01000234: 0x1000234: lw a0, 29596(v0)
+// 0x01000234: 0x1000234: lw a0, 30060(v0)
ldloc 6
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7399
+ ldc.i4 7515
add
ldelem.i4
stloc.1
@@ -1171,7 +1171,7 @@ __CIBYL_javamethod_begin:
ldc.i4 255
stloc.2
// 0x01000308: 0x1000308: sw ra, 284(sp)
-// 0x0100030c: 0x100030c: jal 0x10c0a70 sw v0, 16(sp)
+// 0x0100030c: 0x100030c: jal 0x10c10b0 sw v0, 16(sp)
ldloc 6
ldloc.0
ldc.i4.2
@@ -1185,20 +1185,20 @@ __CIBYL_javamethod_begin:
ldloc.2
ldloc.3
ldloc 4
- call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+ call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
ldsfld int32 [WazeWP7]CRunTime::saved_v1
stloc 7
stloc 5
// --- basic block ---
// 0x01000314: 0x1000314: lui v0, 0xe0000
ldc.i4 917504
stloc 5
-// 0x01000318: 0x1000318: lw a0, 29596(v0)
+// 0x01000318: 0x1000318: lw a0, 30060(v0)
ldloc 6
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7399
+ ldc.i4 7515
add
ldelem.i4
stloc.1
@@ -1839,12 +1839,12 @@ L_10004c8:
// 0x010004f8: 0x10004f8: lui v1, 0xe0000
ldc.i4 917504
stloc 5
-// 0x010004fc: 0x10004fc: jal 0x1001cb8 sw v0, 29592(v1)
+// 0x010004fc: 0x10004fc: jal 0x1001cb8 sw v0, 30056(v1)
ldloc 6
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7398
+ ldc.i4 7514
add
ldloc 7
stelem.i4
@@ -1862,12 +1862,12 @@ L_10004c8:
// 0x01000508: 0x1000508: lui v1, 0xe0000
ldc.i4 917504
stloc 5
-// 0x0100050c: 0x100050c: sw v0, 29596(v1)
+// 0x0100050c: 0x100050c: sw v0, 30060(v1)
ldloc 6
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7399
+ ldc.i4 7515
add
ldloc 7
stelem.i4
@@ -1932,18 +1932,18 @@ __CIBYL_javamethod_begin:
// 0x01000524: 0x1000524: lui v0, 0x20000
ldc.i4 131072
stloc 4
-// 0x01000528: 0x1000528: lw a2, 30204(v0)
+// 0x01000528: 0x1000528: lw a2, 30668(v0)
ldloc 5
ldloc 4
ldc.i4.2
shr.un
- ldc.i4 7551
+ ldc.i4 7667
add
ldelem.i4
stloc.2
-// 0x0100052c: 0x100052c: j 0x1000540 addiu a3, v0, 30204
+// 0x0100052c: 0x100052c: j 0x1000540 addiu a3, v0, 30668
ldloc 4
- ldc.i4 30204
+ ldc.i4 30668
add
stloc.3
br L_1000540
@@ -1952,18 +1952,18 @@ L_1000534:
// 0x01000534: 0x1000534: lui a3, 0x20000
ldc.i4 131072
stloc.3
-// 0x01000538: 0x1000538: lw a2, 30208(a3)
+// 0x01000538: 0x1000538: lw a2, 30672(a3)
ldloc 5
ldloc.3
ldc.i4.2
shr.un
- ldc.i4 7552
+ ldc.i4 7668
add
ldelem.i4
stloc.2
-// 0x0100053c: 0x100053c: addiu a3, a3, 30208
+// 0x0100053c: 0x100053c: addiu a3, a3, 30672
ldloc.3
- ldc.i4 30208
+ ldc.i4 30672
add
stloc.3
L_1000540:
@@ -2084,12 +2084,12 @@ L_1000568:
// 0x010005b8: 0x10005b8: lui a0, 0x20000
ldc.i4 131072
stloc.0
-// 0x010005bc: 0x10005bc: lw a0, 30208(a0)
+// 0x010005bc: 0x10005bc: lw a0, 30672(a0)
ldloc 5
ldloc.0
ldc.i4.2
shr.un
- ldc.i4 7552
+ ldc.i4 7668
add
ldelem.i4
stloc.0
@@ -2129,12 +2129,12 @@ L_10005e4:
// 0x010005e4: 0x10005e4: lui a2, 0x20000
ldc.i4 131072
stloc.2
-// 0x010005e8: 0x10005e8: lw a3, 30220(a2)
+// 0x010005e8: 0x10005e8: lw a3, 30684(a2)
ldloc 5
ldloc.2
ldc.i4.2
shr.un
- ldc.i4 7555
+ ldc.i4 7671
add
ldelem.i4
stloc.3
@@ -2144,12 +2144,12 @@ L_10005e4:
ldc.i4.m1
add
stloc.3
-// 0x010005f4: 0x10005f4: sw a3, 30220(a2)
+// 0x010005f4: 0x10005f4: sw a3, 30684(a2)
ldloc 5
ldloc.2
ldc.i4.2
shr.un
- ldc.i4 7555
+ ldc.i4 7671
add
ldloc.3
stelem.i4
@@ -2169,12 +2169,12 @@ L_10005e4:
stloc.0
bne.un L_100060c
// --- basic block ---
-// 0x01000604: 0x1000604: j 0x1000610 sw a2, 30208(a0)
+// 0x01000604: 0x1000604: j 0x1000610 sw a2, 30672(a0)
ldloc 5
ldloc.0
ldc.i4.2
shr.un
- ldc.i4 7552
+ ldc.i4 7668
add
ldloc.2
stelem.i4
@@ -2233,12 +2233,12 @@ L_100062c:
stloc 7
bne.un L_1000648
// --- basic block ---
-// 0x01000634: 0x1000634: lw t1, 30216(t0)
+// 0x01000634: 0x1000634: lw t1, 30680(t0)
ldloc 5
ldloc 7
ldc.i4.2
shr.un
- ldc.i4 7554
+ ldc.i4 7670
add
ldelem.i4
stloc 8
@@ -2248,12 +2248,12 @@ L_100062c:
ldc.i4.1
add
stloc 8
-// 0x01000640: 0x1000640: j 0x100065c sw t1, 30216(t0)
+// 0x01000640: 0x1000640: j 0x100065c sw t1, 30680(t0)
ldloc 5
ldloc 7
ldc.i4.2
shr.un
- ldc.i4 7554
+ ldc.i4 7670
add
ldloc 8
stelem.i4
@@ -2264,12 +2264,12 @@ L_1000648:
ldc.i4 131072
stloc 7
L_100064c:
-// 0x0100064c: 0x100064c: lw t1, 30220(t0)
+// 0x0100064c: 0x100064c: lw t1, 30684(t0)
ldloc 5
ldloc 7
ldc.i4.2
shr.un
- ldc.i4 7555
+ ldc.i4 7671
add
ldelem.i4
stloc 8
@@ -2279,12 +2279,12 @@ L_100064c:
ldc.i4.1
add
stloc 8
-// 0x01000658: 0x1000658: sw t1, 30220(t0)
+// 0x01000658: 0x1000658: sw t1, 30684(t0)
ldloc 5
ldloc 7
ldc.i4.2
shr.un
- ldc.i4 7555
+ ldc.i4 7671
add
ldloc 8
stelem.i4
@@ -2353,12 +2353,12 @@ L_100066c:
stloc 4
bne.un L_1000700
// --- basic block ---
-// 0x01000694: 0x1000694: lw v0, 30208(v0)
+// 0x01000694: 0x1000694: lw v0, 30672(v0)
ldloc 5
ldloc 4
ldc.i4.2
shr.un
- ldc.i4 7552
+ ldc.i4 7668
add
ldelem.i4
stloc 4
@@ -2398,12 +2398,12 @@ L_10006bc:
// 0x010006bc: 0x10006bc: lui a2, 0x20000
ldc.i4 131072
stloc.2
-// 0x010006c0: 0x10006c0: lw a3, 30220(a2)
+// 0x010006c0: 0x10006c0: lw a3, 30684(a2)
ldloc 5
ldloc.2
ldc.i4.2
shr.un
- ldc.i4 7555
+ ldc.i4 7671
add
ldelem.i4
stloc.3
@@ -2413,12 +2413,12 @@ L_10006bc:
ldc.i4.m1
add
stloc.3
-// 0x010006cc: 0x10006cc: sw a3, 30220(a2)
+// 0x010006cc: 0x10006cc: sw a3, 30684(a2)
ldloc 5
ldloc.2
ldc.i4.2
shr.un
- ldc.i4 7555
+ ldc.i4 7671
add
ldloc.3
stelem.i4
@@ -2438,12 +2438,12 @@ L_10006bc:
stloc 4
bne.un L_10006e4
// --- basic block ---
-// 0x010006dc: 0x10006dc: j 0x10006e8 sw a2, 30208(v0)
+// 0x010006dc: 0x10006dc: j 0x10006e8 sw a2, 30672(v0)
ldloc 5
ldloc 4
ldc.i4.2
shr.un
- ldc.i4 7552
+ ldc.i4 7668
add
ldloc.2
stelem.i4
@@ -2559,60 +2559,60 @@ __CIBYL_javamethod_begin:
// 0x0100071c: 0x100071c: addiu v1, zero, 1
ldc.i4.1
stloc 4
-// 0x01000720: 0x1000720: sw a0, 30208(v0)
+// 0x01000720: 0x1000720: sw a0, 30672(v0)
ldloc 3
ldloc.2
ldc.i4.2
shr.un
- ldc.i4 7552
+ ldc.i4 7668
add
ldloc.0
stelem.i4
// 0x01000724: 0x1000724: lui v0, 0x20000
ldc.i4 131072
stloc.2
-// 0x01000728: 0x1000728: sw v1, 30220(v0)
+// 0x01000728: 0x1000728: sw v1, 30684(v0)
ldloc 3
ldloc.2
ldc.i4.2
shr.un
- ldc.i4 7555
+ ldc.i4 7671
add
ldloc 4
stelem.i4
// 0x0100072c: 0x100072c: lui v0, 0x20000
ldc.i4 131072
stloc.2
-// 0x01000730: 0x1000730: sw zero, 30204(v0)
+// 0x01000730: 0x1000730: sw zero, 30668(v0)
ldloc 3
ldloc.2
ldc.i4.2
shr.un
- ldc.i4 7551
+ ldc.i4 7667
add
ldc.i4.s 0
stelem.i4
// 0x01000734: 0x1000734: lui v0, 0x20000
ldc.i4 131072
stloc.2
-// 0x01000738: 0x1000738: sw zero, 30212(v0)
+// 0x01000738: 0x1000738: sw zero, 30676(v0)
ldloc 3
ldloc.2
ldc.i4.2
shr.un
- ldc.i4 7553
+ ldc.i4 7669
add
ldc.i4.s 0
stelem.i4
// 0x0100073c: 0x100073c: lui v0, 0x20000
ldc.i4 131072
stloc.2
-// 0x01000740: 0x1000740: jr ra sw zero, 30216(v0)
+// 0x01000740: 0x1000740: jr ra sw zero, 30680(v0)
ldloc 3
ldloc.2
ldc.i4.2
shr.un
- ldc.i4 7554
+ ldc.i4 7670
add
ldc.i4.s 0
stelem.i4
@@ -2697,12 +2697,12 @@ __CIBYL_javamethod_begin:
// 0x01000760: 0x1000760: lui v0, 0x20000
ldc.i4 131072
stloc 5
-// 0x01000764: 0x1000764: lw v0, 30200(v0)
+// 0x01000764: 0x1000764: lw v0, 30664(v0)
ldloc 7
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7550
+ ldc.i4 7666
add
ldelem.i4
stloc 5
@@ -2717,12 +2717,12 @@ __CIBYL_javamethod_begin:
// 0x01000778: 0x1000778: lui a0, 0x0
ldc.i4.s 0
stloc.1
-// 0x0100077c: 0x100077c: lw a1, 29596(v0)
+// 0x0100077c: 0x100077c: lw a1, 30060(v0)
ldloc 7
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7399
+ ldc.i4 7515
add
ldelem.i4
stloc.2
@@ -2745,12 +2745,12 @@ L_1000788:
// 0x01000788: 0x1000788: lui v0, 0x20000
ldc.i4 131072
stloc 5
-// 0x0100078c: 0x100078c: lw v0, 30208(v0)
+// 0x0100078c: 0x100078c: lw v0, 30672(v0)
ldloc 7
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7552
+ ldc.i4 7668
add
ldelem.i4
stloc 5
@@ -2838,12 +2838,12 @@ L_10007dc:
// 0x010007ec: 0x10007ec: lui v0, 0x20000
ldc.i4 131072
stloc 5
-// 0x010007f0: 0x10007f0: lw v0, 30200(v0)
+// 0x010007f0: 0x10007f0: lw v0, 30664(v0)
ldloc 7
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7550
+ ldc.i4 7666
add
ldelem.i4
stloc 5
@@ -2854,24 +2854,24 @@ L_10007dc:
stloc 5
brfalse L_10008bc
// --- basic block ---
-// 0x01000800: 0x1000800: lw a0, 29596(v0)
+// 0x01000800: 0x1000800: lw a0, 30060(v0)
ldloc 7
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7399
+ ldc.i4 7515
add
ldelem.i4
stloc.1
// 0x01000804: 0x1000804: lui v0, 0x20000
ldc.i4 131072
stloc 5
-// 0x01000808: 0x1000808: lw a3, 30212(v0)
+// 0x01000808: 0x1000808: lw a3, 30676(v0)
ldloc 7
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7553
+ ldc.i4 7669
add
ldelem.i4
stloc 4
@@ -2932,12 +2932,12 @@ L_1000840:
// 0x01000840: 0x1000840: lui a0, 0x20000
ldc.i4 131072
stloc.1
-// 0x01000844: 0x1000844: lw a1, 30220(a0)
+// 0x01000844: 0x1000844: lw a1, 30684(a0)
ldloc 7
ldloc.1
ldc.i4.2
shr.un
- ldc.i4 7555
+ ldc.i4 7671
add
ldelem.i4
stloc.2
@@ -2947,12 +2947,12 @@ L_1000840:
ldc.i4.m1
add
stloc.2
-// 0x01000850: 0x1000850: sw a1, 30220(a0)
+// 0x01000850: 0x1000850: sw a1, 30684(a0)
ldloc 7
ldloc.1
ldc.i4.2
shr.un
- ldc.i4 7555
+ ldc.i4 7671
add
ldloc.2
stelem.i4
@@ -2972,12 +2972,12 @@ L_1000840:
stloc 5
bne.un L_1000868
// --- basic block ---
-// 0x01000860: 0x1000860: j 0x100086c sw a0, 30208(v0)
+// 0x01000860: 0x1000860: j 0x100086c sw a0, 30672(v0)
ldloc 7
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7552
+ ldc.i4 7668
add
ldloc.1
stelem.i4
@@ -3106,12 +3106,12 @@ L_10008bc:
ldc.i4 131072
stloc 5
L_10008c0:
-// 0x010008c0: 0x10008c0: lw v0, 30200(v0)
+// 0x010008c0: 0x10008c0: lw v0, 30664(v0)
ldloc 7
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7550
+ ldc.i4 7666
add
ldelem.i4
stloc 5
@@ -3125,12 +3125,12 @@ L_10008c0:
// 0x010008d0: 0x10008d0: lui v0, 0xe0000
ldc.i4 917504
stloc 5
-// 0x010008d4: 0x10008d4: lw a0, 29596(v0)
+// 0x010008d4: 0x10008d4: lw a0, 30060(v0)
ldloc 7
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7399
+ ldc.i4 7515
add
ldelem.i4
stloc.1
@@ -3159,12 +3159,12 @@ L_10008e4:
br L_10008fc
// --- basic block ---
L_10008ec:
-// 0x010008ec: 0x10008ec: lw a0, 30212(v1)
+// 0x010008ec: 0x10008ec: lw a0, 30676(v1)
ldloc 7
ldloc 6
ldc.i4.2
shr.un
- ldc.i4 7553
+ ldc.i4 7669
add
ldelem.i4
stloc.1
@@ -3178,12 +3178,12 @@ L_10008ec:
ldloc.1
add
stloc 9
-// 0x010008f8: 0x10008f8: sw s0, 30212(v1)
+// 0x010008f8: 0x10008f8: sw s0, 30676(v1)
ldloc 7
ldloc 6
ldc.i4.2
shr.un
- ldc.i4 7553
+ ldc.i4 7669
add
ldloc 9
stelem.i4
@@ -3347,12 +3347,12 @@ __CIBYL_javamethod_begin:
// 0x01000944: 0x1000944: lui v0, 0x20000
ldc.i4 131072
stloc 5
-// 0x01000948: 0x1000948: lw v0, 30200(v0)
+// 0x01000948: 0x1000948: lw v0, 30664(v0)
ldloc 6
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7550
+ ldc.i4 7666
add
ldelem.i4
stloc 5
@@ -3363,12 +3363,12 @@ __CIBYL_javamethod_begin:
stloc 5
brfalse L_1000a50
// --- basic block ---
-// 0x01000958: 0x1000958: lw a1, 29596(v0)
+// 0x01000958: 0x1000958: lw a1, 30060(v0)
ldloc 6
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7399
+ ldc.i4 7515
add
ldelem.i4
stloc.2
@@ -3397,12 +3397,12 @@ L_1000970:
// 0x01000970: 0x1000970: lui v0, 0x20000
ldc.i4 131072
stloc 5
-// 0x01000974: 0x1000974: lw v0, 30204(v0)
+// 0x01000974: 0x1000974: lw v0, 30668(v0)
ldloc 6
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7551
+ ldc.i4 7667
add
ldelem.i4
stloc 5
@@ -3451,12 +3451,12 @@ L_10009a4:
// 0x010009a4: 0x10009a4: lui v0, 0x20000
ldc.i4 131072
stloc 5
-// 0x010009a8: 0x10009a8: lw v0, 30200(v0)
+// 0x010009a8: 0x10009a8: lw v0, 30664(v0)
ldloc 6
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7550
+ ldc.i4 7666
add
ldelem.i4
stloc 5
@@ -3467,12 +3467,12 @@ L_10009a4:
stloc 5
brfalse L_1000a50
// --- basic block ---
-// 0x010009b8: 0x10009b8: lw a0, 29596(v0)
+// 0x010009b8: 0x10009b8: lw a0, 30060(v0)
ldloc 6
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7399
+ ldc.i4 7515
add
ldelem.i4
stloc.1
@@ -3528,12 +3528,12 @@ L_10009ec:
// 0x010009ec: 0x10009ec: lui a0, 0x20000
ldc.i4 131072
stloc.1
-// 0x010009f0: 0x10009f0: lw a1, 30216(a0)
+// 0x010009f0: 0x10009f0: lw a1, 30680(a0)
ldloc 6
ldloc.1
ldc.i4.2
shr.un
- ldc.i4 7554
+ ldc.i4 7670
add
ldelem.i4
stloc.2
@@ -3543,12 +3543,12 @@ L_10009ec:
ldc.i4.m1
add
stloc.2
-// 0x010009fc: 0x10009fc: sw a1, 30216(a0)
+// 0x010009fc: 0x10009fc: sw a1, 30680(a0)
ldloc 6
ldloc.1
ldc.i4.2
shr.un
- ldc.i4 7554
+ ldc.i4 7670
add
ldloc.2
stelem.i4
@@ -3568,12 +3568,12 @@ L_10009ec:
stloc 5
bne.un L_1000a14
// --- basic block ---
-// 0x01000a0c: 0x1000a0c: j 0x1000a18 sw a0, 30204(v0)
+// 0x01000a0c: 0x1000a0c: j 0x1000a18 sw a0, 30668(v0)
ldloc 6
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7551
+ ldc.i4 7667
add
ldloc.1
stelem.i4
@@ -3617,12 +3617,12 @@ L_1000a18:
add
ldelem.i4
stloc 7
-// 0x01000a2c: 0x1000a2c: lw a0, 30212(v0)
+// 0x01000a2c: 0x1000a2c: lw a0, 30676(v0)
ldloc 6
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7553
+ ldc.i4 7669
add
ldelem.i4
stloc.1
@@ -3632,12 +3632,12 @@ L_1000a18:
ldloc 7
sub
stloc 7
-// 0x01000a38: 0x1000a38: j 0x1000a50 sw v1, 30212(v0)
+// 0x01000a38: 0x1000a38: j 0x1000a50 sw v1, 30676(v0)
ldloc 6
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7553
+ ldc.i4 7669
add
ldloc 7
stelem.i4
@@ -4010,9 +4010,9 @@ __CIBYL_javamethod_begin:
ldc.i4 20548
add
stloc.3
-// 0x01000b10: 0x1000b10: addiu a3, a3, 24148
+// 0x01000b10: 0x1000b10: addiu a3, a3, 24612
ldloc 4
- ldc.i4 24148
+ ldc.i4 24612
add
stloc 4
// 0x01000b14: 0x1000b14: jal 0x1000e78 addiu a1, zero, 23
@@ -4746,15 +4746,15 @@ __CIBYL_javamethod_begin:
ldloc 9
stelem.i4
// 0x01000dd4: 0x1000dd4: sw ra, 284(sp)
-// 0x01000dd8: 0x1000dd8: jal 0x10c0a70 addiu a1, zero, 256
+// 0x01000dd8: 0x1000dd8: jal 0x10c10b0 addiu a1, zero, 256
ldc.i4 256
stloc.2
ldloc.0
ldloc.1
ldloc.2
ldloc.3
ldloc 4
- call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+ call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
ldsfld int32 [WazeWP7]CRunTime::saved_v1
stloc 11
stloc 6
@@ -4905,15 +4905,15 @@ __CIBYL_javamethod_begin:
ldloc 8
stelem.i4
// 0x01000e2c: 0x1000e2c: sw ra, 284(sp)
-// 0x01000e30: 0x1000e30: jal 0x10c0a70 addiu a1, zero, 256
+// 0x01000e30: 0x1000e30: jal 0x10c10b0 addiu a1, zero, 256
ldc.i4 256
stloc.2
ldloc.0
ldloc.1
ldloc.2
ldloc.3
ldloc 4
- call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+ call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
ldsfld int32 [WazeWP7]CRunTime::saved_v1
stloc 9
stloc 5
@@ -4928,12 +4928,12 @@ __CIBYL_javamethod_begin:
// 0x01000e40: 0x1000e40: lui v0, 0xe0000
ldc.i4 917504
stloc 5
-// 0x01000e44: 0x1000e44: lw a1, 29592(v0)
+// 0x01000e44: 0x1000e44: lw a1, 30056(v0)
ldloc 6
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7398
+ ldc.i4 7514
add
ldelem.i4
stloc.2
@@ -4954,12 +4954,12 @@ L_1000e50:
// 0x01000e50: 0x1000e50: lui v0, 0xe0000
ldc.i4 917504
stloc 5
-// 0x01000e54: 0x1000e54: lw a0, 29592(v0)
+// 0x01000e54: 0x1000e54: lw a0, 30056(v0)
ldloc 6
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7398
+ ldc.i4 7514
add
ldelem.i4
stloc.1
@@ -5122,7 +5122,7 @@ __CIBYL_javamethod_begin:
ldloc 8
stelem.i4
// 0x01000ea8: 0x1000ea8: sw ra, 292(sp)
-// 0x01000eac: 0x1000eac: jal 0x10c0a70 sw v0, 16(sp)
+// 0x01000eac: 0x1000eac: jal 0x10c10b0 sw v0, 16(sp)
ldloc 6
ldloc.0
ldc.i4.2
@@ -5136,7 +5136,7 @@ __CIBYL_javamethod_begin:
ldloc.2
ldloc.3
ldloc 4
- call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+ call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
ldsfld int32 [WazeWP7]CRunTime::saved_v1
stloc 9
stloc 5
@@ -5151,12 +5151,12 @@ __CIBYL_javamethod_begin:
// 0x01000ebc: 0x1000ebc: lui v0, 0xe0000
ldc.i4 917504
stloc 5
-// 0x01000ec0: 0x1000ec0: lw a1, 29592(v0)
+// 0x01000ec0: 0x1000ec0: lw a1, 30056(v0)
ldloc 6
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7398
+ ldc.i4 7514
add
ldelem.i4
stloc.2
@@ -5177,12 +5177,12 @@ L_1000ecc:
// 0x01000ecc: 0x1000ecc: lui v0, 0xe0000
ldc.i4 917504
stloc 5
-// 0x01000ed0: 0x1000ed0: lw a0, 29592(v0)
+// 0x01000ed0: 0x1000ed0: lw a0, 30056(v0)
ldloc 6
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 7398
+ ldc.i4 7514
add
ldelem.i4
stloc.1
@@ -5351,7 +5351,7 @@ __CIBYL_javamethod_begin:
ldloc 9
stelem.i4
// 0x01000f28: 0x1000f28: sw ra, 292(sp)
-// 0x01000f2c: 0x1000f2c: jal 0x10c0a70 sw v0, 16(sp)
+// 0x01000f2c: 0x1000f2c: jal 0x10c10b0 sw v0, 16(sp)
ldloc 5
ldloc.0
ldc.i4.2
@@ -5365,7 +5365,7 @@ __CIBYL_javamethod_begin:
ldloc.2
ldloc.3
ldloc 4
- call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+ call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
ldsfld int32 [WazeWP7]CRunTime::saved_v1
stloc 11
stloc 6
@@ -5510,7 +5510,7 @@ __CIBYL_javamethod_begin:
ldc.i4.m1
stloc.2
// 0x01000f80: 0x1000f80: sw ra, 28(sp)
-// 0x01000f84: 0x1000f84: jal 0x10c0a70 sw v0, 16(sp)
+// 0x01000f84: 0x1000f84: jal 0x10c10b0 sw v0, 16(sp)
ldloc 5
ldloc.0
ldc.i4.2
@@ -5524,7 +5524,7 @@ __CIBYL_javamethod_begin:
ldloc.2
ldloc.3
ldloc 4
- call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+ call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
ldsfld int32 [WazeWP7]CRunTime::saved_v1
stloc 8
stloc 6
@@ -5664,7 +5664,7 @@ __CIBYL_javamethod_begin:
ldloc 9
stloc 4
// 0x01000fac: 0x1000fac: sw ra, 28(sp)
-// 0x01000fb0: 0x1000fb0: jal 0x10c0a70 sw v0, 16(sp)
+// 0x01000fb0: 0x1000fb0: jal 0x10c10b0 sw v0, 16(sp)
ldloc 5
ldloc.0
ldc.i4.2
@@ -5678,7 +5678,7 @@ __CIBYL_javamethod_begin:
ldloc.2
ldloc.3
ldloc 4
- call int32 Cibyl143::vsnprintf_10c0a70(int32,int32,int32,int32,int32)
+ call int32 Cibyl143::vsnprintf_10c10b0(int32,int32,int32,int32,int32)
ldsfld int32 [WazeWP7]CRunTime::saved_v1
stloc 17
stloc 9
View
184 converted/Cibyl1.j
@@ -715,9 +715,9 @@ __CIBYL_javamethod_begin:
add
stloc.0
// 0x0100198c: 0x100198c: sw ra, 20(sp)
-// 0x01001990: 0x1001990: jal 0x10018cc addiu a2, a2, 30224
+// 0x01001990: 0x1001990: jal 0x10018cc addiu a2, a2, 30688
ldloc.3
- ldc.i4 30224
+ ldc.i4 30688
add
stloc.3
ldloc.1
@@ -3267,9 +3267,9 @@ __CIBYL_javamethod_begin:
// 0x01002090: 0x1002090: addu s0, zero, zero
ldc.i4.s 0
stloc 8
-// 0x01002094: 0x1002094: j 0x10020e8 addiu s2, s5, 30500
+// 0x01002094: 0x1002094: j 0x10020e8 addiu s2, s5, 30964
ldloc 12
- ldc.i4 30500
+ ldc.i4 30964
add
stloc 10
br L_10020e8
@@ -3284,12 +3284,12 @@ L_100209c:
add
ldelem.i4
stloc.1
-// 0x010020a0: 0x10020a0: lw v1, 30500(s5)
+// 0x010020a0: 0x10020a0: lw v1, 30964(s5)
ldloc 5
ldloc 12
ldc.i4.2
shr.un
- ldc.i4 7625
+ ldc.i4 7741
add
ldelem.i4
stloc 7
@@ -4848,9 +4848,9 @@ __CIBYL_javamethod_begin:
// 0x01002578: 0x1002578: addu s2, zero, zero
ldc.i4.s 0
stloc 10
-// 0x0100257c: 0x100257c: j 0x10025c8 addiu s4, s5, 30484
+// 0x0100257c: 0x100257c: j 0x10025c8 addiu s4, s5, 30948
ldloc 13
- ldc.i4 30484
+ ldc.i4 30948
add
stloc 12
br L_10025c8
@@ -4865,12 +4865,12 @@ L_1002584:
add
ldelem.i4
stloc.1
-// 0x01002588: 0x1002588: lw v1, 30484(s5)
+// 0x01002588: 0x1002588: lw v1, 30948(s5)
ldloc 5
ldloc 13
ldc.i4.2
shr.un
- ldc.i4 7621
+ ldc.i4 7737
add
ldelem.i4
stloc 7
@@ -4973,12 +4973,12 @@ L_10025e4:
brtrue L_1002604
// --- basic block ---
L_10025ec:
-// 0x010025ec: 0x10025ec: lw s0, 30492(v0)
+// 0x010025ec: 0x10025ec: lw s0, 30956(v0)
ldloc 5
ldloc 6
ldc.i4.2
shr.un
- ldc.i4 7623
+ ldc.i4 7739
add
ldelem.i4
stloc 8
@@ -5708,9 +5708,9 @@ __CIBYL_javamethod_begin:
// 0x010027ac: 0x10027ac: addu a3, a2, zero
ldloc.3
stloc 4
-// 0x010027b0: 0x10027b0: addiu a0, a0, 30500
+// 0x010027b0: 0x10027b0: addiu a0, a0, 30964
ldloc.1
- ldc.i4 30500
+ ldc.i4 30964
add
stloc.1
// 0x010027b4: 0x10027b4: addu a1, v1, zero
@@ -5796,9 +5796,9 @@ __CIBYL_javamethod_begin:
// 0x010027e4: 0x10027e4: addu a3, a2, zero
ldloc.3
stloc 4
-// 0x010027e8: 0x10027e8: addiu a0, a0, 30484
+// 0x010027e8: 0x10027e8: addiu a0, a0, 30948
ldloc.1
- ldc.i4 30484
+ ldc.i4 30948
add
stloc.1
// 0x010027ec: 0x10027ec: addu a1, v1, zero
@@ -5870,24 +5870,24 @@ __CIBYL_javamethod_begin:
// 0x0100280c: 0x100280c: lui v0, 0xf0000
ldc.i4 983040
stloc 5
-// 0x01002810: 0x1002810: lw v1, -30072(v0)
+// 0x01002810: 0x1002810: lw v1, -29608(v0)
ldloc 6
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 -7518
+ ldc.i4 -7402
add
ldelem.i4
stloc 7
// 0x01002814: 0x1002814: lui v0, 0xf0000
ldc.i4 983040
stloc 5
-// 0x01002818: 0x1002818: lw v0, -30068(v0)
+// 0x01002818: 0x1002818: lw v0, -29604(v0)
ldloc 6
ldloc 5
ldc.i4.2
shr.un
- ldc.i4 -7517
+ ldc.i4 -7401
add
ldelem.i4
stloc 5
@@ -5928,15 +5928,15 @@ L_1002840: