summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2012-10-19 11:27:53 +0100
committerSimon Marlow <marlowsd@gmail.com>2012-10-19 11:49:37 +0100
commit53810006bbcd3fc9b58893858f95c3432cb33f0e (patch)
treeff4308239be53eb2ed75afb46bee03fc3a6f7ae9 /includes
parent660dc69a777b462fc635e9914fa59bd784bb233c (diff)
downloadhaskell-53810006bbcd3fc9b58893858f95c3432cb33f0e.tar.gz
profiling fixes
Diffstat (limited to 'includes')
-rw-r--r--includes/Cmm.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/includes/Cmm.h b/includes/Cmm.h
index 805806b309..9cb2dbce4b 100644
--- a/includes/Cmm.h
+++ b/includes/Cmm.h
@@ -250,7 +250,7 @@
#define LOAD_INFO(ret,x) \
info = %INFO_PTR(UNTAG(x));
-#define MAYBE_UNTAG(x) UNTAG(x);
+#define UNTAG_IF_PROF(x) UNTAG(x)
#else
@@ -260,7 +260,7 @@
} \
info = %INFO_PTR(x);
-#define MAYBE_UNTAG(x) (x) /* already untagged */
+#define UNTAG_IF_PROF(x) (x) /* already untagged */
#endif
@@ -306,7 +306,7 @@
} \
default: \
{ \
- x = MAYBE_UNTAG(x); \
+ x = UNTAG_IF_PROF(x); \
jump %ENTRY_CODE(info) (x); \
} \
}
@@ -346,13 +346,11 @@
------------------------------------------------------------------------- */
#if defined(PROFILING)
-#define PROF_HDR_FIELDS(w_) PROF_HDR_FIELDS_(w_,prof_hdr_1,prof_hdr_2)
-#define PROF_HDR_FIELDS_(w_,hdr1,hdr2) \
- w_ hdr1, \
+#define PROF_HDR_FIELDS(w_,hdr1,hdr2) \
+ w_ hdr1, \
w_ hdr2,
#else
-#define PROF_HDR_FIELDS(w_) /* nothing */
-#define PROF_HDR_FIELDS_(w_,hdr1,hdr2) /* nothing */
+#define PROF_HDR_FIELDS(w_,hdr1,hdr2) /* nothing */
#endif
/* -------------------------------------------------------------------------