[DTrace-devel] [PATCH v2] Add support for hton and ntoh subroutines

[eugene.loh at oracle.com]

From: Eugene Loh <eugene.loh at oracle.com>

Signed-off-by: Eugene Loh <eugene.loh at oracle.com>
---
 libdtrace/dt_cg.c                       | 36 ++++++++++++++++++++-----
 test/unittest/dif/htonl.d               |  1 -
 test/unittest/dif/htonll.d              |  1 -
 test/unittest/dif/htons.d               |  1 -
 test/unittest/funcs/tst.hton2.aarch64.r |  7 +++++
 test/unittest/funcs/tst.hton2.d         | 28 +++++++++++++++++++
 test/unittest/funcs/tst.hton2.x86_64.r  |  7 +++++
 7 files changed, 72 insertions(+), 9 deletions(-)
 create mode 100644 test/unittest/funcs/tst.hton2.aarch64.r
 create mode 100644 test/unittest/funcs/tst.hton2.d
 create mode 100644 test/unittest/funcs/tst.hton2.x86_64.r

diff --git a/libdtrace/dt_cg.c b/libdtrace/dt_cg.c
index 0caae10a..3ed39886 100644
--- a/libdtrace/dt_cg.c
+++ b/libdtrace/dt_cg.c
@@ -3283,6 +3283,30 @@ dt_cg_subr_strlen(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
 	TRACE_REGSET("    subr-strlen:End  ");
 }
 
+static void
+dt_cg_subr_htons(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
+{
+	dt_cg_node(dnp->dn_args, dlp, drp);
+	dnp->dn_reg = dnp->dn_args->dn_reg;
+	emit(dlp, BPF_END_REG(dnp->dn_reg, BPF_TO_BE, 16));
+}
+
+static void
+dt_cg_subr_htonl(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
+{
+	dt_cg_node(dnp->dn_args, dlp, drp);
+	dnp->dn_reg = dnp->dn_args->dn_reg;
+	emit(dlp, BPF_END_REG(dnp->dn_reg, BPF_TO_BE, 32));
+}
+
+static void
+dt_cg_subr_htonll(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
+{
+	dt_cg_node(dnp->dn_args, dlp, drp);
+	dnp->dn_reg = dnp->dn_args->dn_reg;
+	emit(dlp, BPF_END_REG(dnp->dn_reg, BPF_TO_BE, 64));
+}
+
 typedef void dt_cg_subr_f(dt_node_t *, dt_irlist_t *, dt_regset_t *);
 
 static dt_cg_subr_f *_dt_cg_subr[DIF_SUBR_MAX + 1] = {
@@ -3321,12 +3345,12 @@ static dt_cg_subr_f *_dt_cg_subr[DIF_SUBR_MAX + 1] = {
 	[DIF_SUBR_SUBSTR]		= NULL,
 	[DIF_SUBR_INDEX]		= &dt_cg_subr_index,
 	[DIF_SUBR_RINDEX]		= NULL,
-	[DIF_SUBR_HTONS]		= NULL,
-	[DIF_SUBR_HTONL]		= NULL,
-	[DIF_SUBR_HTONLL]		= NULL,
-	[DIF_SUBR_NTOHS]		= NULL,
-	[DIF_SUBR_NTOHL]		= NULL,
-	[DIF_SUBR_NTOHLL]		= NULL,
+	[DIF_SUBR_HTONS]		= &dt_cg_subr_htons,
+	[DIF_SUBR_HTONL]		= &dt_cg_subr_htonl,
+	[DIF_SUBR_HTONLL]		= &dt_cg_subr_htonll,
+	[DIF_SUBR_NTOHS]		= &dt_cg_subr_htons,
+	[DIF_SUBR_NTOHL]		= &dt_cg_subr_htonl,
+	[DIF_SUBR_NTOHLL]		= &dt_cg_subr_htonll,
 	[DIF_SUBR_INET_NTOP]		= NULL,
 	[DIF_SUBR_INET_NTOA]		= NULL,
 	[DIF_SUBR_INET_NTOA6]		= NULL,
diff --git a/test/unittest/dif/htonl.d b/test/unittest/dif/htonl.d
index 142fccd0..410bc135 100644
--- a/test/unittest/dif/htonl.d
+++ b/test/unittest/dif/htonl.d
@@ -1,5 +1,4 @@
 /* @@runtest-opts: -C */
-/* @@xfail: dtv2 */
 
 #include <endian.h>
 
diff --git a/test/unittest/dif/htonll.d b/test/unittest/dif/htonll.d
index 5705b462..79828736 100644
--- a/test/unittest/dif/htonll.d
+++ b/test/unittest/dif/htonll.d
@@ -1,5 +1,4 @@
 /* @@runtest-opts: -C */
-/* @@xfail: dtv2 */
 
 #include <endian.h>
 
diff --git a/test/unittest/dif/htons.d b/test/unittest/dif/htons.d
index ad09f324..97a4534c 100644
--- a/test/unittest/dif/htons.d
+++ b/test/unittest/dif/htons.d
@@ -1,5 +1,4 @@
 /* @@runtest-opts: -C */
-/* @@xfail: dtv2 */
 
 #include <endian.h>
 
diff --git a/test/unittest/funcs/tst.hton2.aarch64.r b/test/unittest/funcs/tst.hton2.aarch64.r
new file mode 100644
index 00000000..5ca2adb8
--- /dev/null
+++ b/test/unittest/funcs/tst.hton2.aarch64.r
@@ -0,0 +1,7 @@
+f0de
+f0debc9a
+f0debc9a78563412
+f0de
+f0debc9a
+f0debc9a78563412
+
diff --git a/test/unittest/funcs/tst.hton2.d b/test/unittest/funcs/tst.hton2.d
new file mode 100644
index 00000000..a1a506ac
--- /dev/null
+++ b/test/unittest/funcs/tst.hton2.d
@@ -0,0 +1,28 @@
+/*
+ * Oracle Linux DTrace.
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Licensed under the Universal Permissive License v 1.0 as shown at
+ * http://oss.oracle.com/licenses/upl.
+ */
+
+/*
+ * ASSERTION: Test network byte-ordering routines.
+ */
+
+#pragma D option quiet
+
+BEGIN
+{
+	printf("%x\n", htons (0x123456789abcdef0ll));
+	printf("%x\n", htonl (0x123456789abcdef0ll));
+	printf("%x\n", htonll(0x123456789abcdef0ll));
+	printf("%x\n", ntohs (0x123456789abcdef0ll));
+	printf("%x\n", ntohl (0x123456789abcdef0ll));
+	printf("%x\n", ntohll(0x123456789abcdef0ll));
+	exit(0);
+}
+
+ERROR
+{
+	exit(1);
+}
diff --git a/test/unittest/funcs/tst.hton2.x86_64.r b/test/unittest/funcs/tst.hton2.x86_64.r
new file mode 100644
index 00000000..5ca2adb8
--- /dev/null
+++ b/test/unittest/funcs/tst.hton2.x86_64.r
@@ -0,0 +1,7 @@
+f0de
+f0debc9a
+f0debc9a78563412
+f0de
+f0debc9a
+f0debc9a78563412
+
-- 
2.18.4