From bba38cf4e9d28058c14483f44fa074a6d2852ad9 Mon Sep 17 00:00:00 2001
From: "Field G. Van Zee" <field@cs.utexas.edu>
Date: Tue, 19 Mar 2013 18:07:40 -0500
Subject: [PATCH] Added missing conjbeta argument to scald.

---
 frame/1/scalv/bl2_scalv_unb_var1.c  | 1 +
 frame/1d/scald/bl2_scald.c          | 8 ++++++--
 frame/1d/scald/bl2_scald.h          | 2 ++
 frame/1d/scald/bl2_scald_unb_var1.c | 9 +++++++--
 frame/1d/scald/bl2_scald_unb_var1.h | 1 +
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/frame/1/scalv/bl2_scalv_unb_var1.c b/frame/1/scalv/bl2_scalv_unb_var1.c
index a8b44e6b4..576a7a37c 100644
--- a/frame/1/scalv/bl2_scalv_unb_var1.c
+++ b/frame/1/scalv/bl2_scalv_unb_var1.c
@@ -62,6 +62,7 @@ void bl2_scalv_unb_var1( obj_t*  beta,
 	num_t     dt_x      = bl2_obj_datatype( *x );
 
 	conj_t    conjbeta  = bl2_obj_conj_status( *beta );
+
 	dim_t     n         = bl2_obj_vector_dim( *x );
 
 	inc_t     inc_x     = bl2_obj_vector_inc( *x );
diff --git a/frame/1d/scald/bl2_scald.c b/frame/1d/scald/bl2_scald.c
index 845f42674..51659b640 100644
--- a/frame/1d/scald/bl2_scald.c
+++ b/frame/1d/scald/bl2_scald.c
@@ -52,6 +52,7 @@ void bl2_scald( obj_t* beta,
 #define GENTFUNC( ctype, ch, opname, varname ) \
 \
 void PASTEMAC(ch,opname)( \
+                          conj_t  conjbeta, \
                           doff_t  diagoffx, \
                           dim_t   m, \
                           dim_t   n, \
@@ -59,7 +60,8 @@ void PASTEMAC(ch,opname)( \
                           ctype*  x, inc_t rs_x, inc_t cs_x \
                         ) \
 { \
-	PASTEMAC2(ch,ch,varname)( diagoffx, \
+	PASTEMAC2(ch,ch,varname)( conjbeta, \
+	                          diagoffx, \
 	                          m, \
 	                          n, \
 	                          beta, \
@@ -76,6 +78,7 @@ INSERT_GENTFUNC_BASIC( scald, scald_unb_var1 )
 #define GENTFUNC2( ctype_b, ctype_x, chb, chx, opname, varname ) \
 \
 void PASTEMAC2(chb,chx,opname)( \
+                                conj_t   conjbeta, \
                                 doff_t   diagoffx, \
                                 dim_t    m, \
                                 dim_t    n, \
@@ -83,7 +86,8 @@ void PASTEMAC2(chb,chx,opname)( \
                                 ctype_x* x, inc_t rs_x, inc_t cs_x \
                               ) \
 { \
-	PASTEMAC2(chb,chx,varname)( diagoffx, \
+	PASTEMAC2(chb,chx,varname)( conjbeta, \
+	                            diagoffx, \
 	                            m, \
 	                            n, \
 	                            beta, \
diff --git a/frame/1d/scald/bl2_scald.h b/frame/1d/scald/bl2_scald.h
index edac9c227..22806d884 100644
--- a/frame/1d/scald/bl2_scald.h
+++ b/frame/1d/scald/bl2_scald.h
@@ -49,6 +49,7 @@ void bl2_scald( obj_t* beta,
 #define GENTPROT( ctype, ch, opname ) \
 \
 void PASTEMAC(ch,opname)( \
+                          conj_t  conjbeta, \
                           doff_t  diagoffx, \
                           dim_t   m, \
                           dim_t   n, \
@@ -66,6 +67,7 @@ INSERT_GENTPROT_BASIC( scald )
 #define GENTPROT2( ctype_b, ctype_x, chb, chx, opname ) \
 \
 void PASTEMAC2(chb,chx,opname)( \
+                                conj_t   conjbeta, \
                                 doff_t   diagoff, \
                                 dim_t    m, \
                                 dim_t    n, \
diff --git a/frame/1d/scald/bl2_scald_unb_var1.c b/frame/1d/scald/bl2_scald_unb_var1.c
index eabd9cbd1..134f3e0c8 100644
--- a/frame/1d/scald/bl2_scald_unb_var1.c
+++ b/frame/1d/scald/bl2_scald_unb_var1.c
@@ -37,6 +37,7 @@
 #define FUNCPTR_T scald_fp
 
 typedef void (*FUNCPTR_T)(
+                           conj_t  conjbeta,
                            doff_t  diagoffx,
                            dim_t   m,
                            dim_t   n,
@@ -62,6 +63,8 @@ void bl2_scald_unb_var1( obj_t*  beta,
 {
 	num_t     dt_x      = bl2_obj_datatype( *x );
 
+	conj_t    conjbeta  = bl2_obj_conj_status( *beta );
+
 	doff_t    diagoffx  = bl2_obj_diag_offset( *x );
 
 	dim_t     m         = bl2_obj_length( *x );
@@ -86,7 +89,8 @@ void bl2_scald_unb_var1( obj_t*  beta,
 	f = ftypes[dt_beta][dt_x];
 
 	// Invoke the function.
-	f( diagoffx,
+	f( conjbeta,
+	   diagoffx,
 	   m,
 	   n,
 	   buf_beta,
@@ -98,6 +102,7 @@ void bl2_scald_unb_var1( obj_t*  beta,
 #define GENTFUNC2( ctype_b, ctype_x, chb, chx, varname, kername ) \
 \
 void PASTEMAC2(chb,chx,varname)( \
+                                 conj_t  conjbeta, \
                                  doff_t  diagoffx, \
                                  dim_t   m, \
                                  dim_t   n, \
@@ -127,7 +132,7 @@ void PASTEMAC2(chb,chx,varname)( \
 \
 	x1 = x_cast + offx; \
 \
-	PASTEMAC2(chb,chx,kername)( BLIS_NO_CONJUGATE, \
+	PASTEMAC2(chb,chx,kername)( conjbeta, \
 	                            n_elem, \
 	                            beta_cast, \
 	                            x1, incx ); \
diff --git a/frame/1d/scald/bl2_scald_unb_var1.h b/frame/1d/scald/bl2_scald_unb_var1.h
index fe0348134..aad0777d2 100644
--- a/frame/1d/scald/bl2_scald_unb_var1.h
+++ b/frame/1d/scald/bl2_scald_unb_var1.h
@@ -40,6 +40,7 @@ void bl2_scald_unb_var1( obj_t* beta,
 #define GENTPROT2( ctype_b, ctype_x, chb, chx, varname ) \
 \
 void PASTEMAC2(chb,chx,varname)( \
+                                 conj_t  conjbeta, \
                                  doff_t  diagoffx, \
                                  dim_t   m, \
                                  dim_t   n, \