[m-dev.] trivial diff: more `MR_' changes
Fergus Henderson
fjh at cs.mu.OZ.AU
Wed Oct 27 15:32:26 AEST 1999
Estimated hours taken: 0.25
compiler/fact_table.m:
extras/trailed_update/tr_store.m:
Add missing `MR_' prefixes.
Workspace: /home/mercury0/fjh/mercury
Index: compiler/fact_table.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/fact_table.m,v
retrieving revision 1.30
diff -u -d -r1.30 fact_table.m
--- fact_table.m 1999/10/27 05:11:44 1.30
+++ fact_table.m 1999/10/27 05:27:46
@@ -621,7 +621,7 @@
#define FACT_TABLE_MAKE_TAGGED_POINTER(p,t) MR_mkword(MR_mktag(t), p)
#define FACT_TABLE_HASH_ENTRY_TYPE(p) MR_tag((Word)((p).index))
#define FACT_TABLE_HASH_INDEX(w) MR_unmkbody(w)
- #define FACT_TABLE_HASH_POINTER(w) MR_body(w,tag(w))
+ #define FACT_TABLE_HASH_POINTER(w) MR_body(w,MR_tag(w))
#else
#define FACT_TABLE_MAKE_TAGGED_INDEX(i,t) ((const Word *) i), (t)
#define FACT_TABLE_MAKE_TAGGED_POINTER(p,t) ((const Word *) p), (t)
@@ -3279,7 +3279,7 @@
FactTableName),
generate_test_condition_code(FactTableName, PragmaVars, ArgTypes,
ModuleInfo, 1, yes, FactTableSize, CondCode),
- string__append_list(["\t\tif(", CondCode, "\t\t) fail();\n"],
+ string__append_list(["\t\tif(", CondCode, "\t\t) MR_fail();\n"],
FactTestCode).
:- pred generate_test_condition_code(string, list(pragma_var), list(type),
@@ -3363,7 +3363,7 @@
%s
/* save output args to registers */
%s
- if (hashval == -1) succeed_discard();
+ if (hashval == -1) MR_succeed_discard();
MR_framevar(1) = hashval;
MR_framevar(2) = (Word) current_table;
MR_framevar(3) = (Word) keytype;
@@ -3401,7 +3401,7 @@
%s
/* save output args to registers */
%s
- if (hashval == -1) succeed_discard();
+ if (hashval == -1) MR_succeed_discard();
MR_framevar(1) = hashval;
MR_succeed();
failure_code_%s:
Index: extras/trailed_update/tr_store.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/trailed_update/tr_store.m,v
retrieving revision 1.3
diff -u -d -r1.3 tr_store.m
--- tr_store.m 1998/06/17 06:17:46 1.3
+++ tr_store.m 1999/10/27 05:29:00
@@ -300,7 +300,7 @@
will_not_call_mercury,
"{
/* unsafe - does not check type & arity, won't handle no_tag types */
- Word *Ptr = (Word *) strip_tag(Ref);
+ Word *Ptr = (Word *) MR_strip_tag(Ref);
ArgRef = (Word) &Ptr[Arg];
S = S0;
}").
@@ -309,7 +309,7 @@
S0::mdi, S::muo), will_not_call_mercury,
"{
/* unsafe - does not check type & arity, won't handle no_tag types */
- Word *Ptr = (Word *) strip_tag(Val);
+ Word *Ptr = (Word *) MR_strip_tag(Val);
ArgRef = (Word) &Ptr[Arg];
S = S0;
}").
--
Fergus Henderson <fjh at cs.mu.oz.au> | "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh> | of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3 | -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to: mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions: mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------
More information about the developers
mailing list