diff: fix link errors with benchmarking.m

Tyson Richard DOWD trd at cs.mu.oz.au
Tue Aug 5 14:10:29 AEST 1997


Hi,

I've just committed this.

===================================================================

Estimated hours taken: 0.2

library/benchmarking.m:
	Change module qualifiers on symbols from "time" to
	"benchmarking". This fixes the link error that was 
	stopping the compiler from passing its tests.

Index: library/benchmarking.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/benchmarking.m,v
retrieving revision 1.1
diff -u -r1.1 benchmarking.m
--- benchmarking.m	1997/07/28 10:06:13	1.1
+++ benchmarking.m	1997/08/05 03:01:06
@@ -127,17 +127,17 @@
 #define	time_output	r7
 #endif
 
-Define_extern_entry(mercury__time__benchmark_nondet_5_0);
-Declare_label(mercury__time__benchmark_nondet_5_0_i1);
-Declare_label(mercury__time__benchmark_nondet_5_0_i2);
+Define_extern_entry(mercury__benchmarking__benchmark_nondet_5_0);
+Declare_label(mercury__benchmarking__benchmark_nondet_5_0_i1);
+Declare_label(mercury__benchmarking__benchmark_nondet_5_0_i2);
 
 BEGIN_MODULE(benchmark_nondet_module)
-	init_entry(mercury__time__benchmark_nondet_5_0);
-	init_label(mercury__time__benchmark_nondet_5_0_i1);
-	init_label(mercury__time__benchmark_nondet_5_0_i2);
+	init_entry(mercury__benchmarking__benchmark_nondet_5_0);
+	init_label(mercury__benchmarking__benchmark_nondet_5_0_i1);
+	init_label(mercury__benchmarking__benchmark_nondet_5_0_i2);
 BEGIN_CODE
 
-Define_entry(mercury__time__benchmark_nondet_5_0);
+Define_entry(mercury__benchmarking__benchmark_nondet_5_0);
 
 	/*
 	** Create a nondet stack frame. The contents of the slots:
@@ -154,7 +154,7 @@
 	*/
 
 	mkframe(""benchmark_nondet"", 6,
-		LABEL(mercury__time__benchmark_nondet_5_0_i2));
+		LABEL(mercury__benchmarking__benchmark_nondet_5_0_i2));
 
 	framevar(0) = r3;
 	framevar(1) = r4;
@@ -176,16 +176,16 @@
 	{ 
 		Declare_entry(do_call_nondet_closure);
 		call(ENTRY(do_call_nondet_closure),
-			LABEL(mercury__time__benchmark_nondet_5_0_i1),
-			LABEL(mercury__time__benchmark_nondet_5_0));
+			LABEL(mercury__benchmarking__benchmark_nondet_5_0_i1),
+			LABEL(mercury__benchmarking__benchmark_nondet_5_0));
 	}
 
-Define_label(mercury__time__benchmark_nondet_5_0_i1);
+Define_label(mercury__benchmarking__benchmark_nondet_5_0_i1);
 	/* we found a solution */
 	framevar(3) = framevar(3) + 1;
 	redo();
 
-Define_label(mercury__time__benchmark_nondet_5_0_i2);
+Define_label(mercury__benchmarking__benchmark_nondet_5_0_i2);
 	/* no more solutions for this iteration, so mark it completed */
 	framevar(2) = framevar(2) - 1;
 	/* we can now reclaim memory by resetting the heap pointer */
@@ -203,8 +203,8 @@
 		{
 			Declare_entry(do_call_nondet_closure);
 			call(ENTRY(do_call_nondet_closure),
-				LABEL(mercury__time__benchmark_nondet_5_0_i1),
-				LABEL(mercury__time__benchmark_nondet_5_0));
+				LABEL(mercury__benchmarking__benchmark_nondet_5_0_i1),
+				LABEL(mercury__benchmarking__benchmark_nondet_5_0));
 		}
 	}
 
@@ -214,15 +214,15 @@
 	succeed_discard();
 END_MODULE
 
-Define_extern_entry(mercury__time__benchmark_det_5_0);
-Declare_label(mercury__time__benchmark_det_5_0_i1);
+Define_extern_entry(mercury__benchmarking__benchmark_det_5_0);
+Declare_label(mercury__benchmarking__benchmark_det_5_0_i1);
 
 BEGIN_MODULE(benchmark_det_module)
-	init_entry(mercury__time__benchmark_det_5_0);
-	init_label(mercury__time__benchmark_det_5_0_i1);
+	init_entry(mercury__benchmarking__benchmark_det_5_0);
+	init_label(mercury__benchmarking__benchmark_det_5_0_i1);
 BEGIN_CODE
 
-Define_entry(mercury__time__benchmark_det_5_0);
+Define_entry(mercury__benchmarking__benchmark_det_5_0);
 
 	/*
 	** Create a det stack frame. The contents of the slots:
@@ -260,11 +260,11 @@
 	{ 
 		Declare_entry(do_call_det_closure);
 		call(ENTRY(do_call_det_closure),
-			LABEL(mercury__time__benchmark_det_5_0_i1),
-			LABEL(mercury__time__benchmark_det_5_0));
+			LABEL(mercury__benchmarking__benchmark_det_5_0_i1),
+			LABEL(mercury__benchmarking__benchmark_det_5_0));
 	}
 
-Define_label(mercury__time__benchmark_det_5_0_i1);
+Define_label(mercury__benchmarking__benchmark_det_5_0_i1);
 	/* mark current iteration completed */
 	detstackvar(3) = detstackvar(3) - 1;
 	/* are there any other iterations? */
@@ -279,8 +279,8 @@
 		{ 
 			Declare_entry(do_call_det_closure);
 			call(ENTRY(do_call_det_closure),
-				LABEL(mercury__time__benchmark_det_5_0_i1),
-				LABEL(mercury__time__benchmark_det_5_0));
+				LABEL(mercury__benchmarking__benchmark_det_5_0_i1),
+				LABEL(mercury__benchmarking__benchmark_det_5_0));
 		}
 	}
 

-- 
       Tyson Dowd           #          Another great idea from the 
                            #            people who brought you
      trd at .cs.mu.oz.au      #               Beer Milkshakes!
http://www.cs.mu.oz.au/~trd #	         Confidence --- Red Dwarf



More information about the developers mailing list