* ssapre.h: disabled MONO_APPLY_SSAPRE_TO_SINGLE_METHOD
(I left it on by mistake in my previous commit).
svn path=/trunk/mono/; revision=39249
+2005-1-20 Massimiliano Mantione <massi@ximian.com>
+
+ * ssapre.c: Turned usage of snprintf to GString.
+ * ssapre.h: disabled MONO_APPLY_SSAPRE_TO_SINGLE_METHOD
+ (I left it on by mistake in my previous commit).
Thu Jan 20 12:00:45 CET 2005 Paolo Molaro <lupus@ximian.com>
Thu Jan 20 12:00:45 CET 2005 Paolo Molaro <lupus@ximian.com>
2005-1-20 Massimiliano Mantione <massi@ximian.com>
2005-1-20 Massimiliano Mantione <massi@ximian.com>
- abcremoval.c: Fixed bug 71062.
- abcremoval.h: Likewise.
+ * abcremoval.c: Fixed bug 71062.
+ * abcremoval.h: Likewise.
2005-1-20 Massimiliano Mantione <massi@ximian.com>
2005-1-20 Massimiliano Mantione <massi@ximian.com>
}
#if (MONO_APPLY_SSAPRE_TO_SINGLE_EXPRESSION)
}
#if (MONO_APPLY_SSAPRE_TO_SINGLE_EXPRESSION)
-static int
-snprint_argument (char *string, size_t max_length, MonoSsapreExpressionArgument *argument) {
- int length;
+static void
+snprint_argument (GString *string, MonoSsapreExpressionArgument *argument) {
switch (argument->type) {
case MONO_SSAPRE_EXPRESSION_ARGUMENT_ANY:
switch (argument->type) {
case MONO_SSAPRE_EXPRESSION_ARGUMENT_ANY:
- length = snprintf (string, max_length, "ANY");
+ g_string_append_printf (string, "ANY");
break;
case MONO_SSAPRE_EXPRESSION_ARGUMENT_NOT_PRESENT:
break;
case MONO_SSAPRE_EXPRESSION_ARGUMENT_NOT_PRESENT:
- length = snprintf (string, max_length, "NONE");
+ g_string_append_printf (string, "NONE");
break;
case MONO_SSAPRE_EXPRESSION_ARGUMENT_ORIGINAL_VARIABLE:
break;
case MONO_SSAPRE_EXPRESSION_ARGUMENT_ORIGINAL_VARIABLE:
- length = snprintf (string, max_length, "ORIGINAL_VARIABLE %d", argument->argument.original_variable);
+ g_string_append_printf (string, "ORIGINAL_VARIABLE %d", argument->argument.original_variable);
break;
case MONO_SSAPRE_EXPRESSION_ARGUMENT_SSA_VARIABLE:
break;
case MONO_SSAPRE_EXPRESSION_ARGUMENT_SSA_VARIABLE:
- length = snprintf (string, max_length, "SSA_VARIABLE %d", argument->argument.ssa_variable);
+ g_string_append_printf (string, "SSA_VARIABLE %d", argument->argument.ssa_variable);
break;
case MONO_SSAPRE_EXPRESSION_ARGUMENT_INTEGER_CONSTANT:
break;
case MONO_SSAPRE_EXPRESSION_ARGUMENT_INTEGER_CONSTANT:
- length = snprintf (string, max_length, "INTEGER_CONSTANT %d", argument->argument.integer_constant);
+ g_string_append_printf (string, "INTEGER_CONSTANT %d", argument->argument.integer_constant);
break;
case MONO_SSAPRE_EXPRESSION_ARGUMENT_LONG_COSTANT:
break;
case MONO_SSAPRE_EXPRESSION_ARGUMENT_LONG_COSTANT:
- length = snprintf (string, max_length, "LONG_COSTANT %lld", *(argument->argument.long_constant));
+ g_string_append_printf (string, "LONG_COSTANT %lld", *(argument->argument.long_constant));
break;
case MONO_SSAPRE_EXPRESSION_ARGUMENT_FLOAT_COSTANT:
break;
case MONO_SSAPRE_EXPRESSION_ARGUMENT_FLOAT_COSTANT:
- length = snprintf (string, max_length, "FLOAT_COSTANT %f", *(argument->argument.float_constant));
+ g_string_append_printf (string, "FLOAT_COSTANT %f", *(argument->argument.float_constant));
break;
case MONO_SSAPRE_EXPRESSION_ARGUMENT_DOUBLE_COSTANT:
break;
case MONO_SSAPRE_EXPRESSION_ARGUMENT_DOUBLE_COSTANT:
- length = snprintf (string, max_length, "DOUBLE_COSTANT %f", *(argument->argument.double_constant));
+ g_string_append_printf (string, "DOUBLE_COSTANT %f", *(argument->argument.double_constant));
- length = snprintf (string, max_length, "UNKNOWN: %d", argument->type);
+ g_string_append_printf (string, "UNKNOWN: %d", argument->type);
-static int
-snprint_expression_description (char *string, size_t max_length, MonoSsapreExpressionDescription *expression_description) {
- int length = 0;
+static void
+snprint_expression_description (GString *string, MonoSsapreExpressionDescription *expression_description) {
if (expression_description->opcode != 0) {
if (expression_description->opcode != 0) {
- length += snprintf (string + length, max_length - length, "%s ([", mono_inst_name (expression_description->opcode) );
- length += snprint_argument (string + length, max_length - length, &(expression_description->left_argument));
- length += snprintf (string + length, max_length - length, "],[");
- length += snprint_argument (string + length, max_length - length, &(expression_description->right_argument));
- length += snprintf (string + length, max_length - length, "])");
+ g_string_append_printf (string, "%s ([", mono_inst_name (expression_description->opcode) );
+ snprint_argument (string, &(expression_description->left_argument));
+ g_string_append_printf (string, "],[");
+ snprint_argument (string, &(expression_description->right_argument));
+ g_string_append_printf (string, "])");
- length += snprintf (string + length, max_length - length, "ANY");
+ g_string_append_printf (string, "ANY");
mono_ssapre_expression_name = getenv ("MONO_SSAPRE_EXPRESSION_NAME");
}
if (mono_ssapre_expression_name != NULL) {
mono_ssapre_expression_name = getenv ("MONO_SSAPRE_EXPRESSION_NAME");
}
if (mono_ssapre_expression_name != NULL) {
- char expression_name[1024];
- snprint_expression_description (expression_name, 1024, expression_description);
- if (strstr (expression_name, mono_ssapre_expression_name) != NULL) {
- return TRUE;
+ GString *expression_name = g_string_new_len ("", 256);
+ gboolean return_value;
+ snprint_expression_description (expression_name, expression_description);
+ if (strstr (expression_name->str, mono_ssapre_expression_name) != NULL) {
+ return_value = TRUE;
+ g_string_free (expression_name, TRUE);
+ return return_value;
/*
* Hack to apply SSAPRE only to a given method (invaluable in debugging)
*/
/*
* Hack to apply SSAPRE only to a given method (invaluable in debugging)
*/
-#define MONO_APPLY_SSAPRE_TO_SINGLE_METHOD 1
+#define MONO_APPLY_SSAPRE_TO_SINGLE_METHOD 0
/*
* Hack to apply SSAPRE only to a given expression (invaluable in debugging)
/*
* Hack to apply SSAPRE only to a given expression (invaluable in debugging)