diff --git a/src/V3EmitV.cpp b/src/V3EmitV.cpp
index 594795fa5..82015f46d 100644
--- a/src/V3EmitV.cpp
+++ b/src/V3EmitV.cpp
@@ -790,6 +790,10 @@ class EmitVPrefixedFormatter final : public V3OutFormatter {
         }
     }
 
+    virtual void putsOutput(const char* strg) override {
+        for (const char* cp = strg; *cp; cp++) putcOutput(*cp);
+    }
+
 public:
     void prefixFl(FileLine* fl) { m_prefixFl = fl; }
     FileLine* prefixFl() const { return m_prefixFl; }
diff --git a/src/V3File.cpp b/src/V3File.cpp
index 1d5062f65..f6b9cf11d 100644
--- a/src/V3File.cpp
+++ b/src/V3File.cpp
@@ -700,6 +700,10 @@ int V3OutFormatter::endLevels(const char* strg) {
 }
 
 void V3OutFormatter::puts(const char* strg) {
+    if (!v3Global.opt.decoration()) {
+        putsOutput(strg);
+        return;
+    }
     if (m_prependIndent && strg[0] != '\n') {
         putsNoTracking(indentSpaces(endLevels(strg)));
         m_prependIndent = false;
@@ -759,13 +763,8 @@ void V3OutFormatter::puts(const char* strg) {
             break;
         case '(':
             indentInc();
-            if (v3Global.opt.decoration()) {
-                // Line up continuation with open paren, plus one indent
-                m_parenVec.push(m_column);
-            } else {
-                // Line up continuation with block+1
-                m_parenVec.push(m_indentLevel * m_blockIndent);
-            }
+            // Line up continuation with open paren, plus one indent
+            m_parenVec.push(m_column);
             break;
         case ')':
             if (!m_parenVec.empty()) m_parenVec.pop();
@@ -806,6 +805,7 @@ void V3OutFormatter::putBreakExpr() {
 
 // Add a line break if too wide
 void V3OutFormatter::putBreak() {
+    if (!v3Global.opt.decoration()) return;
     if (!m_nobreak) {
         // char s[1000]; sprintf(s, "{%d,%d}", m_column, m_parenVec.top()); putsNoTracking(s);
         if (exceededWidth()) {
@@ -824,11 +824,19 @@ void V3OutFormatter::putsQuoted(const string& strg) {
     putcNoTracking('"');
 }
 void V3OutFormatter::putsNoTracking(const string& strg) {
+    if (!v3Global.opt.decoration()) {
+        putsOutput(strg.c_str());
+        return;
+    }
     // Don't track {}'s, probably because it's a $display format string
     for (const char c : strg) putcNoTracking(c);
 }
 
 void V3OutFormatter::putcNoTracking(char chr) {
+    if (!v3Global.opt.decoration()) {
+        putcOutput(chr);
+        return;
+    }
     switch (chr) {
     case '\n':
         m_lineno++;
diff --git a/src/V3File.h b/src/V3File.h
index d3d54e4f4..dd337b165 100644
--- a/src/V3File.h
+++ b/src/V3File.h
@@ -176,6 +176,7 @@ public:
 
     // CALLBACKS - MUST OVERRIDE
     virtual void putcOutput(char chr) = 0;
+    virtual void putsOutput(const char* str) = 0;
 };
 
 //============================================================================
@@ -193,6 +194,7 @@ public:
 private:
     // CALLBACKS
     virtual void putcOutput(char chr) override { fputc(chr, m_fp); }
+    virtual void putsOutput(const char* str) override { fputs(str, m_fp); }
 };
 
 class V3OutCFile VL_NOT_FINAL : public V3OutFile {
diff --git a/test_regress/t/t_dpi_arg_inout_type__Dpi.out b/test_regress/t/t_dpi_arg_inout_type__Dpi.out
index b800f7d8f..e046f7857 100644
--- a/test_regress/t/t_dpi_arg_inout_type__Dpi.out
+++ b/test_regress/t/t_dpi_arg_inout_type__Dpi.out
@@ -15,142 +15,142 @@ extern "C" {
 #endif
 
 
- // DPI EXPORTS
- extern void e_array_2_state_1(svBitVecVal* x);
- extern void e_array_2_state_128(svBitVecVal* x);
- extern void e_array_2_state_32(svBitVecVal* x);
- extern void e_array_2_state_33(svBitVecVal* x);
- extern void e_array_2_state_64(svBitVecVal* x);
- extern void e_array_2_state_65(svBitVecVal* x);
- extern void e_array_4_state_1(svLogicVecVal* x);
- extern void e_array_4_state_128(svLogicVecVal* x);
- extern void e_array_4_state_32(svLogicVecVal* x);
- extern void e_array_4_state_33(svLogicVecVal* x);
- extern void e_array_4_state_64(svLogicVecVal* x);
- extern void e_array_4_state_65(svLogicVecVal* x);
- extern void e_bit(svBit* x);
- extern void e_bit_t(svBit* x);
- extern void e_byte(char* x);
- extern void e_byte_t(char* x);
- extern void e_byte_unsigned(unsigned char* x);
- extern void e_byte_unsigned_t(unsigned char* x);
- extern void e_chandle(void** x);
- extern void e_chandle_t(void** x);
- extern void e_int(int* x);
- extern void e_int_t(int* x);
- extern void e_int_unsigned(unsigned int* x);
- extern void e_int_unsigned_t(unsigned int* x);
- extern void e_integer(svLogicVecVal* x);
- extern void e_integer_t(svLogicVecVal* x);
- extern void e_logic(svLogic* x);
- extern void e_logic_t(svLogic* x);
- extern void e_longint(long long* x);
- extern void e_longint_t(long long* x);
- extern void e_longint_unsigned(unsigned long long* x);
- extern void e_longint_unsigned_t(unsigned long long* x);
- extern void e_real(double* x);
- extern void e_real_t(double* x);
- extern void e_shortint(short* x);
- extern void e_shortint_t(short* x);
- extern void e_shortint_unsigned(unsigned short* x);
- extern void e_shortint_unsigned_t(unsigned short* x);
- extern void e_string(const char** x);
- extern void e_string_t(const char** x);
- extern void e_struct_2_state_1(svBitVecVal* x);
- extern void e_struct_2_state_128(svBitVecVal* x);
- extern void e_struct_2_state_32(svBitVecVal* x);
- extern void e_struct_2_state_33(svBitVecVal* x);
- extern void e_struct_2_state_64(svBitVecVal* x);
- extern void e_struct_2_state_65(svBitVecVal* x);
- extern void e_struct_4_state_1(svLogicVecVal* x);
- extern void e_struct_4_state_128(svLogicVecVal* x);
- extern void e_struct_4_state_32(svLogicVecVal* x);
- extern void e_struct_4_state_33(svLogicVecVal* x);
- extern void e_struct_4_state_64(svLogicVecVal* x);
- extern void e_struct_4_state_65(svLogicVecVal* x);
- extern void e_time(svLogicVecVal* x);
- extern void e_time_t(svLogicVecVal* x);
- extern void e_union_2_state_1(svBitVecVal* x);
- extern void e_union_2_state_128(svBitVecVal* x);
- extern void e_union_2_state_32(svBitVecVal* x);
- extern void e_union_2_state_33(svBitVecVal* x);
- extern void e_union_2_state_64(svBitVecVal* x);
- extern void e_union_2_state_65(svBitVecVal* x);
- extern void e_union_4_state_1(svLogicVecVal* x);
- extern void e_union_4_state_128(svLogicVecVal* x);
- extern void e_union_4_state_32(svLogicVecVal* x);
- extern void e_union_4_state_33(svLogicVecVal* x);
- extern void e_union_4_state_64(svLogicVecVal* x);
- extern void e_union_4_state_65(svLogicVecVal* x);
+// DPI EXPORTS
+extern void e_array_2_state_1(svBitVecVal* x);
+extern void e_array_2_state_128(svBitVecVal* x);
+extern void e_array_2_state_32(svBitVecVal* x);
+extern void e_array_2_state_33(svBitVecVal* x);
+extern void e_array_2_state_64(svBitVecVal* x);
+extern void e_array_2_state_65(svBitVecVal* x);
+extern void e_array_4_state_1(svLogicVecVal* x);
+extern void e_array_4_state_128(svLogicVecVal* x);
+extern void e_array_4_state_32(svLogicVecVal* x);
+extern void e_array_4_state_33(svLogicVecVal* x);
+extern void e_array_4_state_64(svLogicVecVal* x);
+extern void e_array_4_state_65(svLogicVecVal* x);
+extern void e_bit(svBit* x);
+extern void e_bit_t(svBit* x);
+extern void e_byte(char* x);
+extern void e_byte_t(char* x);
+extern void e_byte_unsigned(unsigned char* x);
+extern void e_byte_unsigned_t(unsigned char* x);
+extern void e_chandle(void** x);
+extern void e_chandle_t(void** x);
+extern void e_int(int* x);
+extern void e_int_t(int* x);
+extern void e_int_unsigned(unsigned int* x);
+extern void e_int_unsigned_t(unsigned int* x);
+extern void e_integer(svLogicVecVal* x);
+extern void e_integer_t(svLogicVecVal* x);
+extern void e_logic(svLogic* x);
+extern void e_logic_t(svLogic* x);
+extern void e_longint(long long* x);
+extern void e_longint_t(long long* x);
+extern void e_longint_unsigned(unsigned long long* x);
+extern void e_longint_unsigned_t(unsigned long long* x);
+extern void e_real(double* x);
+extern void e_real_t(double* x);
+extern void e_shortint(short* x);
+extern void e_shortint_t(short* x);
+extern void e_shortint_unsigned(unsigned short* x);
+extern void e_shortint_unsigned_t(unsigned short* x);
+extern void e_string(const char** x);
+extern void e_string_t(const char** x);
+extern void e_struct_2_state_1(svBitVecVal* x);
+extern void e_struct_2_state_128(svBitVecVal* x);
+extern void e_struct_2_state_32(svBitVecVal* x);
+extern void e_struct_2_state_33(svBitVecVal* x);
+extern void e_struct_2_state_64(svBitVecVal* x);
+extern void e_struct_2_state_65(svBitVecVal* x);
+extern void e_struct_4_state_1(svLogicVecVal* x);
+extern void e_struct_4_state_128(svLogicVecVal* x);
+extern void e_struct_4_state_32(svLogicVecVal* x);
+extern void e_struct_4_state_33(svLogicVecVal* x);
+extern void e_struct_4_state_64(svLogicVecVal* x);
+extern void e_struct_4_state_65(svLogicVecVal* x);
+extern void e_time(svLogicVecVal* x);
+extern void e_time_t(svLogicVecVal* x);
+extern void e_union_2_state_1(svBitVecVal* x);
+extern void e_union_2_state_128(svBitVecVal* x);
+extern void e_union_2_state_32(svBitVecVal* x);
+extern void e_union_2_state_33(svBitVecVal* x);
+extern void e_union_2_state_64(svBitVecVal* x);
+extern void e_union_2_state_65(svBitVecVal* x);
+extern void e_union_4_state_1(svLogicVecVal* x);
+extern void e_union_4_state_128(svLogicVecVal* x);
+extern void e_union_4_state_32(svLogicVecVal* x);
+extern void e_union_4_state_33(svLogicVecVal* x);
+extern void e_union_4_state_64(svLogicVecVal* x);
+extern void e_union_4_state_65(svLogicVecVal* x);
 
- // DPI IMPORTS
- extern void check_exports();
- extern void i_array_2_state_1(svBitVecVal* x);
- extern void i_array_2_state_128(svBitVecVal* x);
- extern void i_array_2_state_32(svBitVecVal* x);
- extern void i_array_2_state_33(svBitVecVal* x);
- extern void i_array_2_state_64(svBitVecVal* x);
- extern void i_array_2_state_65(svBitVecVal* x);
- extern void i_array_4_state_1(svLogicVecVal* x);
- extern void i_array_4_state_128(svLogicVecVal* x);
- extern void i_array_4_state_32(svLogicVecVal* x);
- extern void i_array_4_state_33(svLogicVecVal* x);
- extern void i_array_4_state_64(svLogicVecVal* x);
- extern void i_array_4_state_65(svLogicVecVal* x);
- extern void i_bit(svBit* x);
- extern void i_bit_t(svBit* x);
- extern void i_byte(char* x);
- extern void i_byte_t(char* x);
- extern void i_byte_unsigned(unsigned char* x);
- extern void i_byte_unsigned_t(unsigned char* x);
- extern void i_chandle(void** x);
- extern void i_chandle_t(void** x);
- extern void i_int(int* x);
- extern void i_int_t(int* x);
- extern void i_int_unsigned(unsigned int* x);
- extern void i_int_unsigned_t(unsigned int* x);
- extern void i_integer(svLogicVecVal* x);
- extern void i_integer_t(svLogicVecVal* x);
- extern void i_logic(svLogic* x);
- extern void i_logic_t(svLogic* x);
- extern void i_longint(long long* x);
- extern void i_longint_t(long long* x);
- extern void i_longint_unsigned(unsigned long long* x);
- extern void i_longint_unsigned_t(unsigned long long* x);
- extern void i_real(double* x);
- extern void i_real_t(double* x);
- extern void i_shortint(short* x);
- extern void i_shortint_t(short* x);
- extern void i_shortint_unsigned(unsigned short* x);
- extern void i_shortint_unsigned_t(unsigned short* x);
- extern void i_string(const char** x);
- extern void i_string_t(const char** x);
- extern void i_struct_2_state_1(svBitVecVal* x);
- extern void i_struct_2_state_128(svBitVecVal* x);
- extern void i_struct_2_state_32(svBitVecVal* x);
- extern void i_struct_2_state_33(svBitVecVal* x);
- extern void i_struct_2_state_64(svBitVecVal* x);
- extern void i_struct_2_state_65(svBitVecVal* x);
- extern void i_struct_4_state_1(svLogicVecVal* x);
- extern void i_struct_4_state_128(svLogicVecVal* x);
- extern void i_struct_4_state_32(svLogicVecVal* x);
- extern void i_struct_4_state_33(svLogicVecVal* x);
- extern void i_struct_4_state_64(svLogicVecVal* x);
- extern void i_struct_4_state_65(svLogicVecVal* x);
- extern void i_time(svLogicVecVal* x);
- extern void i_time_t(svLogicVecVal* x);
- extern void i_union_2_state_1(svBitVecVal* x);
- extern void i_union_2_state_128(svBitVecVal* x);
- extern void i_union_2_state_32(svBitVecVal* x);
- extern void i_union_2_state_33(svBitVecVal* x);
- extern void i_union_2_state_64(svBitVecVal* x);
- extern void i_union_2_state_65(svBitVecVal* x);
- extern void i_union_4_state_1(svLogicVecVal* x);
- extern void i_union_4_state_128(svLogicVecVal* x);
- extern void i_union_4_state_32(svLogicVecVal* x);
- extern void i_union_4_state_33(svLogicVecVal* x);
- extern void i_union_4_state_64(svLogicVecVal* x);
- extern void i_union_4_state_65(svLogicVecVal* x);
+// DPI IMPORTS
+extern void check_exports();
+extern void i_array_2_state_1(svBitVecVal* x);
+extern void i_array_2_state_128(svBitVecVal* x);
+extern void i_array_2_state_32(svBitVecVal* x);
+extern void i_array_2_state_33(svBitVecVal* x);
+extern void i_array_2_state_64(svBitVecVal* x);
+extern void i_array_2_state_65(svBitVecVal* x);
+extern void i_array_4_state_1(svLogicVecVal* x);
+extern void i_array_4_state_128(svLogicVecVal* x);
+extern void i_array_4_state_32(svLogicVecVal* x);
+extern void i_array_4_state_33(svLogicVecVal* x);
+extern void i_array_4_state_64(svLogicVecVal* x);
+extern void i_array_4_state_65(svLogicVecVal* x);
+extern void i_bit(svBit* x);
+extern void i_bit_t(svBit* x);
+extern void i_byte(char* x);
+extern void i_byte_t(char* x);
+extern void i_byte_unsigned(unsigned char* x);
+extern void i_byte_unsigned_t(unsigned char* x);
+extern void i_chandle(void** x);
+extern void i_chandle_t(void** x);
+extern void i_int(int* x);
+extern void i_int_t(int* x);
+extern void i_int_unsigned(unsigned int* x);
+extern void i_int_unsigned_t(unsigned int* x);
+extern void i_integer(svLogicVecVal* x);
+extern void i_integer_t(svLogicVecVal* x);
+extern void i_logic(svLogic* x);
+extern void i_logic_t(svLogic* x);
+extern void i_longint(long long* x);
+extern void i_longint_t(long long* x);
+extern void i_longint_unsigned(unsigned long long* x);
+extern void i_longint_unsigned_t(unsigned long long* x);
+extern void i_real(double* x);
+extern void i_real_t(double* x);
+extern void i_shortint(short* x);
+extern void i_shortint_t(short* x);
+extern void i_shortint_unsigned(unsigned short* x);
+extern void i_shortint_unsigned_t(unsigned short* x);
+extern void i_string(const char** x);
+extern void i_string_t(const char** x);
+extern void i_struct_2_state_1(svBitVecVal* x);
+extern void i_struct_2_state_128(svBitVecVal* x);
+extern void i_struct_2_state_32(svBitVecVal* x);
+extern void i_struct_2_state_33(svBitVecVal* x);
+extern void i_struct_2_state_64(svBitVecVal* x);
+extern void i_struct_2_state_65(svBitVecVal* x);
+extern void i_struct_4_state_1(svLogicVecVal* x);
+extern void i_struct_4_state_128(svLogicVecVal* x);
+extern void i_struct_4_state_32(svLogicVecVal* x);
+extern void i_struct_4_state_33(svLogicVecVal* x);
+extern void i_struct_4_state_64(svLogicVecVal* x);
+extern void i_struct_4_state_65(svLogicVecVal* x);
+extern void i_time(svLogicVecVal* x);
+extern void i_time_t(svLogicVecVal* x);
+extern void i_union_2_state_1(svBitVecVal* x);
+extern void i_union_2_state_128(svBitVecVal* x);
+extern void i_union_2_state_32(svBitVecVal* x);
+extern void i_union_2_state_33(svBitVecVal* x);
+extern void i_union_2_state_64(svBitVecVal* x);
+extern void i_union_2_state_65(svBitVecVal* x);
+extern void i_union_4_state_1(svLogicVecVal* x);
+extern void i_union_4_state_128(svLogicVecVal* x);
+extern void i_union_4_state_32(svLogicVecVal* x);
+extern void i_union_4_state_33(svLogicVecVal* x);
+extern void i_union_4_state_64(svLogicVecVal* x);
+extern void i_union_4_state_65(svLogicVecVal* x);
 
 #ifdef __cplusplus
 }
diff --git a/test_regress/t/t_dpi_arg_inout_unpack__Dpi.out b/test_regress/t/t_dpi_arg_inout_unpack__Dpi.out
index 8c6d9be71..83beb561a 100644
--- a/test_regress/t/t_dpi_arg_inout_unpack__Dpi.out
+++ b/test_regress/t/t_dpi_arg_inout_unpack__Dpi.out
@@ -15,171 +15,171 @@ extern "C" {
 #endif
 
 
- // DPI EXPORTS
- extern void e_bit121_0d(svBitVecVal* val);
- extern void e_bit121_1d(svBitVecVal* val);
- extern void e_bit121_2d(svBitVecVal* val);
- extern void e_bit121_3d(svBitVecVal* val);
- extern void e_bit1_0d(svBit* val);
- extern void e_bit1_1d(svBit* val);
- extern void e_bit1_2d(svBit* val);
- extern void e_bit1_3d(svBit* val);
- extern void e_bit7_0d(svBitVecVal* val);
- extern void e_bit7_1d(svBitVecVal* val);
- extern void e_bit7_2d(svBitVecVal* val);
- extern void e_bit7_3d(svBitVecVal* val);
- extern void e_byte_0d(char* val);
- extern void e_byte_1d(char* val);
- extern void e_byte_2d(char* val);
- extern void e_byte_3d(char* val);
- extern void e_byte_unsigned_0d(unsigned char* val);
- extern void e_byte_unsigned_1d(unsigned char* val);
- extern void e_byte_unsigned_2d(unsigned char* val);
- extern void e_byte_unsigned_3d(unsigned char* val);
- extern void e_chandle_0d(void** val);
- extern void e_chandle_1d(void** val);
- extern void e_chandle_2d(void** val);
- extern void e_chandle_3d(void** val);
- extern void e_int_0d(int* val);
- extern void e_int_1d(int* val);
- extern void e_int_2d(int* val);
- extern void e_int_3d(int* val);
- extern void e_int_unsigned_0d(unsigned int* val);
- extern void e_int_unsigned_1d(unsigned int* val);
- extern void e_int_unsigned_2d(unsigned int* val);
- extern void e_int_unsigned_3d(unsigned int* val);
- extern void e_integer_0d(svLogicVecVal* val);
- extern void e_integer_1d(svLogicVecVal* val);
- extern void e_integer_2d(svLogicVecVal* val);
- extern void e_integer_3d(svLogicVecVal* val);
- extern void e_logic121_0d(svLogicVecVal* val);
- extern void e_logic121_1d(svLogicVecVal* val);
- extern void e_logic121_2d(svLogicVecVal* val);
- extern void e_logic121_3d(svLogicVecVal* val);
- extern void e_logic1_0d(svLogic* val);
- extern void e_logic1_1d(svLogic* val);
- extern void e_logic1_2d(svLogic* val);
- extern void e_logic1_3d(svLogic* val);
- extern void e_logic7_0d(svLogicVecVal* val);
- extern void e_logic7_1d(svLogicVecVal* val);
- extern void e_logic7_2d(svLogicVecVal* val);
- extern void e_logic7_3d(svLogicVecVal* val);
- extern void e_longint_0d(long long* val);
- extern void e_longint_1d(long long* val);
- extern void e_longint_2d(long long* val);
- extern void e_longint_3d(long long* val);
- extern void e_longint_unsigned_0d(unsigned long long* val);
- extern void e_longint_unsigned_1d(unsigned long long* val);
- extern void e_longint_unsigned_2d(unsigned long long* val);
- extern void e_longint_unsigned_3d(unsigned long long* val);
- extern void e_pack_struct_0d(svLogicVecVal* val);
- extern void e_pack_struct_1d(svLogicVecVal* val);
- extern void e_pack_struct_2d(svLogicVecVal* val);
- extern void e_pack_struct_3d(svLogicVecVal* val);
- extern void e_real_0d(double* val);
- extern void e_real_1d(double* val);
- extern void e_real_2d(double* val);
- extern void e_real_3d(double* val);
- extern void e_shortint_0d(short* val);
- extern void e_shortint_1d(short* val);
- extern void e_shortint_2d(short* val);
- extern void e_shortint_3d(short* val);
- extern void e_shortint_unsigned_0d(unsigned short* val);
- extern void e_shortint_unsigned_1d(unsigned short* val);
- extern void e_shortint_unsigned_2d(unsigned short* val);
- extern void e_shortint_unsigned_3d(unsigned short* val);
- extern void e_string_0d(const char** val);
- extern void e_string_1d(const char** val);
- extern void e_string_2d(const char** val);
- extern void e_string_3d(const char** val);
- extern void e_time_0d(svLogicVecVal* val);
- extern void e_time_1d(svLogicVecVal* val);
- extern void e_time_2d(svLogicVecVal* val);
- extern void e_time_3d(svLogicVecVal* val);
+// DPI EXPORTS
+extern void e_bit121_0d(svBitVecVal* val);
+extern void e_bit121_1d(svBitVecVal* val);
+extern void e_bit121_2d(svBitVecVal* val);
+extern void e_bit121_3d(svBitVecVal* val);
+extern void e_bit1_0d(svBit* val);
+extern void e_bit1_1d(svBit* val);
+extern void e_bit1_2d(svBit* val);
+extern void e_bit1_3d(svBit* val);
+extern void e_bit7_0d(svBitVecVal* val);
+extern void e_bit7_1d(svBitVecVal* val);
+extern void e_bit7_2d(svBitVecVal* val);
+extern void e_bit7_3d(svBitVecVal* val);
+extern void e_byte_0d(char* val);
+extern void e_byte_1d(char* val);
+extern void e_byte_2d(char* val);
+extern void e_byte_3d(char* val);
+extern void e_byte_unsigned_0d(unsigned char* val);
+extern void e_byte_unsigned_1d(unsigned char* val);
+extern void e_byte_unsigned_2d(unsigned char* val);
+extern void e_byte_unsigned_3d(unsigned char* val);
+extern void e_chandle_0d(void** val);
+extern void e_chandle_1d(void** val);
+extern void e_chandle_2d(void** val);
+extern void e_chandle_3d(void** val);
+extern void e_int_0d(int* val);
+extern void e_int_1d(int* val);
+extern void e_int_2d(int* val);
+extern void e_int_3d(int* val);
+extern void e_int_unsigned_0d(unsigned int* val);
+extern void e_int_unsigned_1d(unsigned int* val);
+extern void e_int_unsigned_2d(unsigned int* val);
+extern void e_int_unsigned_3d(unsigned int* val);
+extern void e_integer_0d(svLogicVecVal* val);
+extern void e_integer_1d(svLogicVecVal* val);
+extern void e_integer_2d(svLogicVecVal* val);
+extern void e_integer_3d(svLogicVecVal* val);
+extern void e_logic121_0d(svLogicVecVal* val);
+extern void e_logic121_1d(svLogicVecVal* val);
+extern void e_logic121_2d(svLogicVecVal* val);
+extern void e_logic121_3d(svLogicVecVal* val);
+extern void e_logic1_0d(svLogic* val);
+extern void e_logic1_1d(svLogic* val);
+extern void e_logic1_2d(svLogic* val);
+extern void e_logic1_3d(svLogic* val);
+extern void e_logic7_0d(svLogicVecVal* val);
+extern void e_logic7_1d(svLogicVecVal* val);
+extern void e_logic7_2d(svLogicVecVal* val);
+extern void e_logic7_3d(svLogicVecVal* val);
+extern void e_longint_0d(long long* val);
+extern void e_longint_1d(long long* val);
+extern void e_longint_2d(long long* val);
+extern void e_longint_3d(long long* val);
+extern void e_longint_unsigned_0d(unsigned long long* val);
+extern void e_longint_unsigned_1d(unsigned long long* val);
+extern void e_longint_unsigned_2d(unsigned long long* val);
+extern void e_longint_unsigned_3d(unsigned long long* val);
+extern void e_pack_struct_0d(svLogicVecVal* val);
+extern void e_pack_struct_1d(svLogicVecVal* val);
+extern void e_pack_struct_2d(svLogicVecVal* val);
+extern void e_pack_struct_3d(svLogicVecVal* val);
+extern void e_real_0d(double* val);
+extern void e_real_1d(double* val);
+extern void e_real_2d(double* val);
+extern void e_real_3d(double* val);
+extern void e_shortint_0d(short* val);
+extern void e_shortint_1d(short* val);
+extern void e_shortint_2d(short* val);
+extern void e_shortint_3d(short* val);
+extern void e_shortint_unsigned_0d(unsigned short* val);
+extern void e_shortint_unsigned_1d(unsigned short* val);
+extern void e_shortint_unsigned_2d(unsigned short* val);
+extern void e_shortint_unsigned_3d(unsigned short* val);
+extern void e_string_0d(const char** val);
+extern void e_string_1d(const char** val);
+extern void e_string_2d(const char** val);
+extern void e_string_3d(const char** val);
+extern void e_time_0d(svLogicVecVal* val);
+extern void e_time_1d(svLogicVecVal* val);
+extern void e_time_2d(svLogicVecVal* val);
+extern void e_time_3d(svLogicVecVal* val);
 
- // DPI IMPORTS
- extern void check_exports();
- extern void* get_non_null();
- extern void i_bit121_0d(svBitVecVal* val);
- extern void i_bit121_1d(svBitVecVal* val);
- extern void i_bit121_2d(svBitVecVal* val);
- extern void i_bit121_3d(svBitVecVal* val);
- extern void i_bit1_0d(svBit* val);
- extern void i_bit1_1d(svBit* val);
- extern void i_bit1_2d(svBit* val);
- extern void i_bit1_3d(svBit* val);
- extern void i_bit7_0d(svBitVecVal* val);
- extern void i_bit7_1d(svBitVecVal* val);
- extern void i_bit7_2d(svBitVecVal* val);
- extern void i_bit7_3d(svBitVecVal* val);
- extern void i_byte_0d(char* val);
- extern void i_byte_1d(char* val);
- extern void i_byte_2d(char* val);
- extern void i_byte_3d(char* val);
- extern void i_byte_unsigned_0d(unsigned char* val);
- extern void i_byte_unsigned_1d(unsigned char* val);
- extern void i_byte_unsigned_2d(unsigned char* val);
- extern void i_byte_unsigned_3d(unsigned char* val);
- extern void i_chandle_0d(void** val);
- extern void i_chandle_1d(void** val);
- extern void i_chandle_2d(void** val);
- extern void i_chandle_3d(void** val);
- extern void i_int_0d(int* val);
- extern void i_int_1d(int* val);
- extern void i_int_2d(int* val);
- extern void i_int_3d(int* val);
- extern void i_int_unsigned_0d(unsigned int* val);
- extern void i_int_unsigned_1d(unsigned int* val);
- extern void i_int_unsigned_2d(unsigned int* val);
- extern void i_int_unsigned_3d(unsigned int* val);
- extern void i_integer_0d(svLogicVecVal* val);
- extern void i_integer_1d(svLogicVecVal* val);
- extern void i_integer_2d(svLogicVecVal* val);
- extern void i_integer_3d(svLogicVecVal* val);
- extern void i_logic121_0d(svLogicVecVal* val);
- extern void i_logic121_1d(svLogicVecVal* val);
- extern void i_logic121_2d(svLogicVecVal* val);
- extern void i_logic121_3d(svLogicVecVal* val);
- extern void i_logic1_0d(svLogic* val);
- extern void i_logic1_1d(svLogic* val);
- extern void i_logic1_2d(svLogic* val);
- extern void i_logic1_3d(svLogic* val);
- extern void i_logic7_0d(svLogicVecVal* val);
- extern void i_logic7_1d(svLogicVecVal* val);
- extern void i_logic7_2d(svLogicVecVal* val);
- extern void i_logic7_3d(svLogicVecVal* val);
- extern void i_longint_0d(long long* val);
- extern void i_longint_1d(long long* val);
- extern void i_longint_2d(long long* val);
- extern void i_longint_3d(long long* val);
- extern void i_longint_unsigned_0d(unsigned long long* val);
- extern void i_longint_unsigned_1d(unsigned long long* val);
- extern void i_longint_unsigned_2d(unsigned long long* val);
- extern void i_longint_unsigned_3d(unsigned long long* val);
- extern void i_pack_struct_0d(svLogicVecVal* val);
- extern void i_pack_struct_1d(svLogicVecVal* val);
- extern void i_pack_struct_2d(svLogicVecVal* val);
- extern void i_pack_struct_3d(svLogicVecVal* val);
- extern void i_real_0d(double* val);
- extern void i_real_1d(double* val);
- extern void i_real_2d(double* val);
- extern void i_real_3d(double* val);
- extern void i_shortint_0d(short* val);
- extern void i_shortint_1d(short* val);
- extern void i_shortint_2d(short* val);
- extern void i_shortint_3d(short* val);
- extern void i_shortint_unsigned_0d(unsigned short* val);
- extern void i_shortint_unsigned_1d(unsigned short* val);
- extern void i_shortint_unsigned_2d(unsigned short* val);
- extern void i_shortint_unsigned_3d(unsigned short* val);
- extern void i_string_0d(const char** val);
- extern void i_string_1d(const char** val);
- extern void i_string_2d(const char** val);
- extern void i_string_3d(const char** val);
- extern void i_time_0d(svLogicVecVal* val);
- extern void i_time_1d(svLogicVecVal* val);
- extern void i_time_2d(svLogicVecVal* val);
- extern void i_time_3d(svLogicVecVal* val);
+// DPI IMPORTS
+extern void check_exports();
+extern void* get_non_null();
+extern void i_bit121_0d(svBitVecVal* val);
+extern void i_bit121_1d(svBitVecVal* val);
+extern void i_bit121_2d(svBitVecVal* val);
+extern void i_bit121_3d(svBitVecVal* val);
+extern void i_bit1_0d(svBit* val);
+extern void i_bit1_1d(svBit* val);
+extern void i_bit1_2d(svBit* val);
+extern void i_bit1_3d(svBit* val);
+extern void i_bit7_0d(svBitVecVal* val);
+extern void i_bit7_1d(svBitVecVal* val);
+extern void i_bit7_2d(svBitVecVal* val);
+extern void i_bit7_3d(svBitVecVal* val);
+extern void i_byte_0d(char* val);
+extern void i_byte_1d(char* val);
+extern void i_byte_2d(char* val);
+extern void i_byte_3d(char* val);
+extern void i_byte_unsigned_0d(unsigned char* val);
+extern void i_byte_unsigned_1d(unsigned char* val);
+extern void i_byte_unsigned_2d(unsigned char* val);
+extern void i_byte_unsigned_3d(unsigned char* val);
+extern void i_chandle_0d(void** val);
+extern void i_chandle_1d(void** val);
+extern void i_chandle_2d(void** val);
+extern void i_chandle_3d(void** val);
+extern void i_int_0d(int* val);
+extern void i_int_1d(int* val);
+extern void i_int_2d(int* val);
+extern void i_int_3d(int* val);
+extern void i_int_unsigned_0d(unsigned int* val);
+extern void i_int_unsigned_1d(unsigned int* val);
+extern void i_int_unsigned_2d(unsigned int* val);
+extern void i_int_unsigned_3d(unsigned int* val);
+extern void i_integer_0d(svLogicVecVal* val);
+extern void i_integer_1d(svLogicVecVal* val);
+extern void i_integer_2d(svLogicVecVal* val);
+extern void i_integer_3d(svLogicVecVal* val);
+extern void i_logic121_0d(svLogicVecVal* val);
+extern void i_logic121_1d(svLogicVecVal* val);
+extern void i_logic121_2d(svLogicVecVal* val);
+extern void i_logic121_3d(svLogicVecVal* val);
+extern void i_logic1_0d(svLogic* val);
+extern void i_logic1_1d(svLogic* val);
+extern void i_logic1_2d(svLogic* val);
+extern void i_logic1_3d(svLogic* val);
+extern void i_logic7_0d(svLogicVecVal* val);
+extern void i_logic7_1d(svLogicVecVal* val);
+extern void i_logic7_2d(svLogicVecVal* val);
+extern void i_logic7_3d(svLogicVecVal* val);
+extern void i_longint_0d(long long* val);
+extern void i_longint_1d(long long* val);
+extern void i_longint_2d(long long* val);
+extern void i_longint_3d(long long* val);
+extern void i_longint_unsigned_0d(unsigned long long* val);
+extern void i_longint_unsigned_1d(unsigned long long* val);
+extern void i_longint_unsigned_2d(unsigned long long* val);
+extern void i_longint_unsigned_3d(unsigned long long* val);
+extern void i_pack_struct_0d(svLogicVecVal* val);
+extern void i_pack_struct_1d(svLogicVecVal* val);
+extern void i_pack_struct_2d(svLogicVecVal* val);
+extern void i_pack_struct_3d(svLogicVecVal* val);
+extern void i_real_0d(double* val);
+extern void i_real_1d(double* val);
+extern void i_real_2d(double* val);
+extern void i_real_3d(double* val);
+extern void i_shortint_0d(short* val);
+extern void i_shortint_1d(short* val);
+extern void i_shortint_2d(short* val);
+extern void i_shortint_3d(short* val);
+extern void i_shortint_unsigned_0d(unsigned short* val);
+extern void i_shortint_unsigned_1d(unsigned short* val);
+extern void i_shortint_unsigned_2d(unsigned short* val);
+extern void i_shortint_unsigned_3d(unsigned short* val);
+extern void i_string_0d(const char** val);
+extern void i_string_1d(const char** val);
+extern void i_string_2d(const char** val);
+extern void i_string_3d(const char** val);
+extern void i_time_0d(svLogicVecVal* val);
+extern void i_time_1d(svLogicVecVal* val);
+extern void i_time_2d(svLogicVecVal* val);
+extern void i_time_3d(svLogicVecVal* val);
 
 #ifdef __cplusplus
 }
diff --git a/test_regress/t/t_dpi_arg_input_type__Dpi.out b/test_regress/t/t_dpi_arg_input_type__Dpi.out
index d0994c659..e8f345295 100644
--- a/test_regress/t/t_dpi_arg_input_type__Dpi.out
+++ b/test_regress/t/t_dpi_arg_input_type__Dpi.out
@@ -15,142 +15,142 @@ extern "C" {
 #endif
 
 
- // DPI EXPORTS
- extern void e_array_2_state_1(const svBitVecVal* i);
- extern void e_array_2_state_128(const svBitVecVal* i);
- extern void e_array_2_state_32(const svBitVecVal* i);
- extern void e_array_2_state_33(const svBitVecVal* i);
- extern void e_array_2_state_64(const svBitVecVal* i);
- extern void e_array_2_state_65(const svBitVecVal* i);
- extern void e_array_4_state_1(const svLogicVecVal* i);
- extern void e_array_4_state_128(const svLogicVecVal* i);
- extern void e_array_4_state_32(const svLogicVecVal* i);
- extern void e_array_4_state_33(const svLogicVecVal* i);
- extern void e_array_4_state_64(const svLogicVecVal* i);
- extern void e_array_4_state_65(const svLogicVecVal* i);
- extern void e_bit(svBit i);
- extern void e_bit_t(svBit i);
- extern void e_byte(char i);
- extern void e_byte_t(char i);
- extern void e_byte_unsigned(unsigned char i);
- extern void e_byte_unsigned_t(unsigned char i);
- extern void e_chandle(void* i);
- extern void e_chandle_t(void* i);
- extern void e_int(int i);
- extern void e_int_t(int i);
- extern void e_int_unsigned(unsigned int i);
- extern void e_int_unsigned_t(unsigned int i);
- extern void e_integer(const svLogicVecVal* i);
- extern void e_integer_t(const svLogicVecVal* i);
- extern void e_logic(svLogic i);
- extern void e_logic_t(svLogic i);
- extern void e_longint(long long i);
- extern void e_longint_t(long long i);
- extern void e_longint_unsigned(unsigned long long i);
- extern void e_longint_unsigned_t(unsigned long long i);
- extern void e_real(double i);
- extern void e_real_t(double i);
- extern void e_shortint(short i);
- extern void e_shortint_t(short i);
- extern void e_shortint_unsigned(unsigned short i);
- extern void e_shortint_unsigned_t(unsigned short i);
- extern void e_string(const char* i);
- extern void e_string_t(const char* i);
- extern void e_struct_2_state_1(const svBitVecVal* i);
- extern void e_struct_2_state_128(const svBitVecVal* i);
- extern void e_struct_2_state_32(const svBitVecVal* i);
- extern void e_struct_2_state_33(const svBitVecVal* i);
- extern void e_struct_2_state_64(const svBitVecVal* i);
- extern void e_struct_2_state_65(const svBitVecVal* i);
- extern void e_struct_4_state_1(const svLogicVecVal* i);
- extern void e_struct_4_state_128(const svLogicVecVal* i);
- extern void e_struct_4_state_32(const svLogicVecVal* i);
- extern void e_struct_4_state_33(const svLogicVecVal* i);
- extern void e_struct_4_state_64(const svLogicVecVal* i);
- extern void e_struct_4_state_65(const svLogicVecVal* i);
- extern void e_time(const svLogicVecVal* i);
- extern void e_time_t(const svLogicVecVal* i);
- extern void e_union_2_state_1(const svBitVecVal* i);
- extern void e_union_2_state_128(const svBitVecVal* i);
- extern void e_union_2_state_32(const svBitVecVal* i);
- extern void e_union_2_state_33(const svBitVecVal* i);
- extern void e_union_2_state_64(const svBitVecVal* i);
- extern void e_union_2_state_65(const svBitVecVal* i);
- extern void e_union_4_state_1(const svLogicVecVal* i);
- extern void e_union_4_state_128(const svLogicVecVal* i);
- extern void e_union_4_state_32(const svLogicVecVal* i);
- extern void e_union_4_state_33(const svLogicVecVal* i);
- extern void e_union_4_state_64(const svLogicVecVal* i);
- extern void e_union_4_state_65(const svLogicVecVal* i);
+// DPI EXPORTS
+extern void e_array_2_state_1(const svBitVecVal* i);
+extern void e_array_2_state_128(const svBitVecVal* i);
+extern void e_array_2_state_32(const svBitVecVal* i);
+extern void e_array_2_state_33(const svBitVecVal* i);
+extern void e_array_2_state_64(const svBitVecVal* i);
+extern void e_array_2_state_65(const svBitVecVal* i);
+extern void e_array_4_state_1(const svLogicVecVal* i);
+extern void e_array_4_state_128(const svLogicVecVal* i);
+extern void e_array_4_state_32(const svLogicVecVal* i);
+extern void e_array_4_state_33(const svLogicVecVal* i);
+extern void e_array_4_state_64(const svLogicVecVal* i);
+extern void e_array_4_state_65(const svLogicVecVal* i);
+extern void e_bit(svBit i);
+extern void e_bit_t(svBit i);
+extern void e_byte(char i);
+extern void e_byte_t(char i);
+extern void e_byte_unsigned(unsigned char i);
+extern void e_byte_unsigned_t(unsigned char i);
+extern void e_chandle(void* i);
+extern void e_chandle_t(void* i);
+extern void e_int(int i);
+extern void e_int_t(int i);
+extern void e_int_unsigned(unsigned int i);
+extern void e_int_unsigned_t(unsigned int i);
+extern void e_integer(const svLogicVecVal* i);
+extern void e_integer_t(const svLogicVecVal* i);
+extern void e_logic(svLogic i);
+extern void e_logic_t(svLogic i);
+extern void e_longint(long long i);
+extern void e_longint_t(long long i);
+extern void e_longint_unsigned(unsigned long long i);
+extern void e_longint_unsigned_t(unsigned long long i);
+extern void e_real(double i);
+extern void e_real_t(double i);
+extern void e_shortint(short i);
+extern void e_shortint_t(short i);
+extern void e_shortint_unsigned(unsigned short i);
+extern void e_shortint_unsigned_t(unsigned short i);
+extern void e_string(const char* i);
+extern void e_string_t(const char* i);
+extern void e_struct_2_state_1(const svBitVecVal* i);
+extern void e_struct_2_state_128(const svBitVecVal* i);
+extern void e_struct_2_state_32(const svBitVecVal* i);
+extern void e_struct_2_state_33(const svBitVecVal* i);
+extern void e_struct_2_state_64(const svBitVecVal* i);
+extern void e_struct_2_state_65(const svBitVecVal* i);
+extern void e_struct_4_state_1(const svLogicVecVal* i);
+extern void e_struct_4_state_128(const svLogicVecVal* i);
+extern void e_struct_4_state_32(const svLogicVecVal* i);
+extern void e_struct_4_state_33(const svLogicVecVal* i);
+extern void e_struct_4_state_64(const svLogicVecVal* i);
+extern void e_struct_4_state_65(const svLogicVecVal* i);
+extern void e_time(const svLogicVecVal* i);
+extern void e_time_t(const svLogicVecVal* i);
+extern void e_union_2_state_1(const svBitVecVal* i);
+extern void e_union_2_state_128(const svBitVecVal* i);
+extern void e_union_2_state_32(const svBitVecVal* i);
+extern void e_union_2_state_33(const svBitVecVal* i);
+extern void e_union_2_state_64(const svBitVecVal* i);
+extern void e_union_2_state_65(const svBitVecVal* i);
+extern void e_union_4_state_1(const svLogicVecVal* i);
+extern void e_union_4_state_128(const svLogicVecVal* i);
+extern void e_union_4_state_32(const svLogicVecVal* i);
+extern void e_union_4_state_33(const svLogicVecVal* i);
+extern void e_union_4_state_64(const svLogicVecVal* i);
+extern void e_union_4_state_65(const svLogicVecVal* i);
 
- // DPI IMPORTS
- extern void check_exports();
- extern void i_array_2_state_1(const svBitVecVal* i);
- extern void i_array_2_state_128(const svBitVecVal* i);
- extern void i_array_2_state_32(const svBitVecVal* i);
- extern void i_array_2_state_33(const svBitVecVal* i);
- extern void i_array_2_state_64(const svBitVecVal* i);
- extern void i_array_2_state_65(const svBitVecVal* i);
- extern void i_array_4_state_1(const svLogicVecVal* i);
- extern void i_array_4_state_128(const svLogicVecVal* i);
- extern void i_array_4_state_32(const svLogicVecVal* i);
- extern void i_array_4_state_33(const svLogicVecVal* i);
- extern void i_array_4_state_64(const svLogicVecVal* i);
- extern void i_array_4_state_65(const svLogicVecVal* i);
- extern void i_bit(svBit i);
- extern void i_bit_t(svBit i);
- extern void i_byte(char i);
- extern void i_byte_t(char i);
- extern void i_byte_unsigned(unsigned char i);
- extern void i_byte_unsigned_t(unsigned char i);
- extern void i_chandle(void* i);
- extern void i_chandle_t(void* i);
- extern void i_int(int i);
- extern void i_int_t(int i);
- extern void i_int_unsigned(unsigned int i);
- extern void i_int_unsigned_t(unsigned int i);
- extern void i_integer(const svLogicVecVal* i);
- extern void i_integer_t(const svLogicVecVal* i);
- extern void i_logic(svLogic i);
- extern void i_logic_t(svLogic i);
- extern void i_longint(long long i);
- extern void i_longint_t(long long i);
- extern void i_longint_unsigned(unsigned long long i);
- extern void i_longint_unsigned_t(unsigned long long i);
- extern void i_real(double i);
- extern void i_real_t(double i);
- extern void i_shortint(short i);
- extern void i_shortint_t(short i);
- extern void i_shortint_unsigned(unsigned short i);
- extern void i_shortint_unsigned_t(unsigned short i);
- extern void i_string(const char* i);
- extern void i_string_t(const char* i);
- extern void i_struct_2_state_1(const svBitVecVal* i);
- extern void i_struct_2_state_128(const svBitVecVal* i);
- extern void i_struct_2_state_32(const svBitVecVal* i);
- extern void i_struct_2_state_33(const svBitVecVal* i);
- extern void i_struct_2_state_64(const svBitVecVal* i);
- extern void i_struct_2_state_65(const svBitVecVal* i);
- extern void i_struct_4_state_1(const svLogicVecVal* i);
- extern void i_struct_4_state_128(const svLogicVecVal* i);
- extern void i_struct_4_state_32(const svLogicVecVal* i);
- extern void i_struct_4_state_33(const svLogicVecVal* i);
- extern void i_struct_4_state_64(const svLogicVecVal* i);
- extern void i_struct_4_state_65(const svLogicVecVal* i);
- extern void i_time(const svLogicVecVal* i);
- extern void i_time_t(const svLogicVecVal* i);
- extern void i_union_2_state_1(const svBitVecVal* i);
- extern void i_union_2_state_128(const svBitVecVal* i);
- extern void i_union_2_state_32(const svBitVecVal* i);
- extern void i_union_2_state_33(const svBitVecVal* i);
- extern void i_union_2_state_64(const svBitVecVal* i);
- extern void i_union_2_state_65(const svBitVecVal* i);
- extern void i_union_4_state_1(const svLogicVecVal* i);
- extern void i_union_4_state_128(const svLogicVecVal* i);
- extern void i_union_4_state_32(const svLogicVecVal* i);
- extern void i_union_4_state_33(const svLogicVecVal* i);
- extern void i_union_4_state_64(const svLogicVecVal* i);
- extern void i_union_4_state_65(const svLogicVecVal* i);
+// DPI IMPORTS
+extern void check_exports();
+extern void i_array_2_state_1(const svBitVecVal* i);
+extern void i_array_2_state_128(const svBitVecVal* i);
+extern void i_array_2_state_32(const svBitVecVal* i);
+extern void i_array_2_state_33(const svBitVecVal* i);
+extern void i_array_2_state_64(const svBitVecVal* i);
+extern void i_array_2_state_65(const svBitVecVal* i);
+extern void i_array_4_state_1(const svLogicVecVal* i);
+extern void i_array_4_state_128(const svLogicVecVal* i);
+extern void i_array_4_state_32(const svLogicVecVal* i);
+extern void i_array_4_state_33(const svLogicVecVal* i);
+extern void i_array_4_state_64(const svLogicVecVal* i);
+extern void i_array_4_state_65(const svLogicVecVal* i);
+extern void i_bit(svBit i);
+extern void i_bit_t(svBit i);
+extern void i_byte(char i);
+extern void i_byte_t(char i);
+extern void i_byte_unsigned(unsigned char i);
+extern void i_byte_unsigned_t(unsigned char i);
+extern void i_chandle(void* i);
+extern void i_chandle_t(void* i);
+extern void i_int(int i);
+extern void i_int_t(int i);
+extern void i_int_unsigned(unsigned int i);
+extern void i_int_unsigned_t(unsigned int i);
+extern void i_integer(const svLogicVecVal* i);
+extern void i_integer_t(const svLogicVecVal* i);
+extern void i_logic(svLogic i);
+extern void i_logic_t(svLogic i);
+extern void i_longint(long long i);
+extern void i_longint_t(long long i);
+extern void i_longint_unsigned(unsigned long long i);
+extern void i_longint_unsigned_t(unsigned long long i);
+extern void i_real(double i);
+extern void i_real_t(double i);
+extern void i_shortint(short i);
+extern void i_shortint_t(short i);
+extern void i_shortint_unsigned(unsigned short i);
+extern void i_shortint_unsigned_t(unsigned short i);
+extern void i_string(const char* i);
+extern void i_string_t(const char* i);
+extern void i_struct_2_state_1(const svBitVecVal* i);
+extern void i_struct_2_state_128(const svBitVecVal* i);
+extern void i_struct_2_state_32(const svBitVecVal* i);
+extern void i_struct_2_state_33(const svBitVecVal* i);
+extern void i_struct_2_state_64(const svBitVecVal* i);
+extern void i_struct_2_state_65(const svBitVecVal* i);
+extern void i_struct_4_state_1(const svLogicVecVal* i);
+extern void i_struct_4_state_128(const svLogicVecVal* i);
+extern void i_struct_4_state_32(const svLogicVecVal* i);
+extern void i_struct_4_state_33(const svLogicVecVal* i);
+extern void i_struct_4_state_64(const svLogicVecVal* i);
+extern void i_struct_4_state_65(const svLogicVecVal* i);
+extern void i_time(const svLogicVecVal* i);
+extern void i_time_t(const svLogicVecVal* i);
+extern void i_union_2_state_1(const svBitVecVal* i);
+extern void i_union_2_state_128(const svBitVecVal* i);
+extern void i_union_2_state_32(const svBitVecVal* i);
+extern void i_union_2_state_33(const svBitVecVal* i);
+extern void i_union_2_state_64(const svBitVecVal* i);
+extern void i_union_2_state_65(const svBitVecVal* i);
+extern void i_union_4_state_1(const svLogicVecVal* i);
+extern void i_union_4_state_128(const svLogicVecVal* i);
+extern void i_union_4_state_32(const svLogicVecVal* i);
+extern void i_union_4_state_33(const svLogicVecVal* i);
+extern void i_union_4_state_64(const svLogicVecVal* i);
+extern void i_union_4_state_65(const svLogicVecVal* i);
 
 #ifdef __cplusplus
 }
diff --git a/test_regress/t/t_dpi_arg_input_unpack__Dpi.out b/test_regress/t/t_dpi_arg_input_unpack__Dpi.out
index 4d1afa518..ad4c02bc7 100644
--- a/test_regress/t/t_dpi_arg_input_unpack__Dpi.out
+++ b/test_regress/t/t_dpi_arg_input_unpack__Dpi.out
@@ -15,171 +15,171 @@ extern "C" {
 #endif
 
 
- // DPI EXPORTS
- extern void e_bit121_0d(const svBitVecVal* val);
- extern void e_bit121_1d(const svBitVecVal* val);
- extern void e_bit121_2d(const svBitVecVal* val);
- extern void e_bit121_3d(const svBitVecVal* val);
- extern void e_bit1_0d(svBit val);
- extern void e_bit1_1d(const svBit* val);
- extern void e_bit1_2d(const svBit* val);
- extern void e_bit1_3d(const svBit* val);
- extern void e_bit7_0d(const svBitVecVal* val);
- extern void e_bit7_1d(const svBitVecVal* val);
- extern void e_bit7_2d(const svBitVecVal* val);
- extern void e_bit7_3d(const svBitVecVal* val);
- extern void e_byte_0d(char val);
- extern void e_byte_1d(const char* val);
- extern void e_byte_2d(const char* val);
- extern void e_byte_3d(const char* val);
- extern void e_byte_unsigned_0d(unsigned char val);
- extern void e_byte_unsigned_1d(const unsigned char* val);
- extern void e_byte_unsigned_2d(const unsigned char* val);
- extern void e_byte_unsigned_3d(const unsigned char* val);
- extern void e_chandle_0d(void* val);
- extern void e_chandle_1d(const void** val);
- extern void e_chandle_2d(const void** val);
- extern void e_chandle_3d(const void** val);
- extern void e_int_0d(int val);
- extern void e_int_1d(const int* val);
- extern void e_int_2d(const int* val);
- extern void e_int_3d(const int* val);
- extern void e_int_unsigned_0d(unsigned int val);
- extern void e_int_unsigned_1d(const unsigned int* val);
- extern void e_int_unsigned_2d(const unsigned int* val);
- extern void e_int_unsigned_3d(const unsigned int* val);
- extern void e_integer_0d(const svLogicVecVal* val);
- extern void e_integer_1d(const svLogicVecVal* val);
- extern void e_integer_2d(const svLogicVecVal* val);
- extern void e_integer_3d(const svLogicVecVal* val);
- extern void e_logic121_0d(const svLogicVecVal* val);
- extern void e_logic121_1d(const svLogicVecVal* val);
- extern void e_logic121_2d(const svLogicVecVal* val);
- extern void e_logic121_3d(const svLogicVecVal* val);
- extern void e_logic1_0d(svLogic val);
- extern void e_logic1_1d(const svLogic* val);
- extern void e_logic1_2d(const svLogic* val);
- extern void e_logic1_3d(const svLogic* val);
- extern void e_logic7_0d(const svLogicVecVal* val);
- extern void e_logic7_1d(const svLogicVecVal* val);
- extern void e_logic7_2d(const svLogicVecVal* val);
- extern void e_logic7_3d(const svLogicVecVal* val);
- extern void e_longint_0d(long long val);
- extern void e_longint_1d(const long long* val);
- extern void e_longint_2d(const long long* val);
- extern void e_longint_3d(const long long* val);
- extern void e_longint_unsigned_0d(unsigned long long val);
- extern void e_longint_unsigned_1d(const unsigned long long* val);
- extern void e_longint_unsigned_2d(const unsigned long long* val);
- extern void e_longint_unsigned_3d(const unsigned long long* val);
- extern void e_pack_struct_0d(const svLogicVecVal* val);
- extern void e_pack_struct_1d(const svLogicVecVal* val);
- extern void e_pack_struct_2d(const svLogicVecVal* val);
- extern void e_pack_struct_3d(const svLogicVecVal* val);
- extern void e_real_0d(double val);
- extern void e_real_1d(const double* val);
- extern void e_real_2d(const double* val);
- extern void e_real_3d(const double* val);
- extern void e_shortint_0d(short val);
- extern void e_shortint_1d(const short* val);
- extern void e_shortint_2d(const short* val);
- extern void e_shortint_3d(const short* val);
- extern void e_shortint_unsigned_0d(unsigned short val);
- extern void e_shortint_unsigned_1d(const unsigned short* val);
- extern void e_shortint_unsigned_2d(const unsigned short* val);
- extern void e_shortint_unsigned_3d(const unsigned short* val);
- extern void e_string_0d(const char* val);
- extern void e_string_1d(const char** val);
- extern void e_string_2d(const char** val);
- extern void e_string_3d(const char** val);
- extern void e_time_0d(const svLogicVecVal* val);
- extern void e_time_1d(const svLogicVecVal* val);
- extern void e_time_2d(const svLogicVecVal* val);
- extern void e_time_3d(const svLogicVecVal* val);
+// DPI EXPORTS
+extern void e_bit121_0d(const svBitVecVal* val);
+extern void e_bit121_1d(const svBitVecVal* val);
+extern void e_bit121_2d(const svBitVecVal* val);
+extern void e_bit121_3d(const svBitVecVal* val);
+extern void e_bit1_0d(svBit val);
+extern void e_bit1_1d(const svBit* val);
+extern void e_bit1_2d(const svBit* val);
+extern void e_bit1_3d(const svBit* val);
+extern void e_bit7_0d(const svBitVecVal* val);
+extern void e_bit7_1d(const svBitVecVal* val);
+extern void e_bit7_2d(const svBitVecVal* val);
+extern void e_bit7_3d(const svBitVecVal* val);
+extern void e_byte_0d(char val);
+extern void e_byte_1d(const char* val);
+extern void e_byte_2d(const char* val);
+extern void e_byte_3d(const char* val);
+extern void e_byte_unsigned_0d(unsigned char val);
+extern void e_byte_unsigned_1d(const unsigned char* val);
+extern void e_byte_unsigned_2d(const unsigned char* val);
+extern void e_byte_unsigned_3d(const unsigned char* val);
+extern void e_chandle_0d(void* val);
+extern void e_chandle_1d(const void** val);
+extern void e_chandle_2d(const void** val);
+extern void e_chandle_3d(const void** val);
+extern void e_int_0d(int val);
+extern void e_int_1d(const int* val);
+extern void e_int_2d(const int* val);
+extern void e_int_3d(const int* val);
+extern void e_int_unsigned_0d(unsigned int val);
+extern void e_int_unsigned_1d(const unsigned int* val);
+extern void e_int_unsigned_2d(const unsigned int* val);
+extern void e_int_unsigned_3d(const unsigned int* val);
+extern void e_integer_0d(const svLogicVecVal* val);
+extern void e_integer_1d(const svLogicVecVal* val);
+extern void e_integer_2d(const svLogicVecVal* val);
+extern void e_integer_3d(const svLogicVecVal* val);
+extern void e_logic121_0d(const svLogicVecVal* val);
+extern void e_logic121_1d(const svLogicVecVal* val);
+extern void e_logic121_2d(const svLogicVecVal* val);
+extern void e_logic121_3d(const svLogicVecVal* val);
+extern void e_logic1_0d(svLogic val);
+extern void e_logic1_1d(const svLogic* val);
+extern void e_logic1_2d(const svLogic* val);
+extern void e_logic1_3d(const svLogic* val);
+extern void e_logic7_0d(const svLogicVecVal* val);
+extern void e_logic7_1d(const svLogicVecVal* val);
+extern void e_logic7_2d(const svLogicVecVal* val);
+extern void e_logic7_3d(const svLogicVecVal* val);
+extern void e_longint_0d(long long val);
+extern void e_longint_1d(const long long* val);
+extern void e_longint_2d(const long long* val);
+extern void e_longint_3d(const long long* val);
+extern void e_longint_unsigned_0d(unsigned long long val);
+extern void e_longint_unsigned_1d(const unsigned long long* val);
+extern void e_longint_unsigned_2d(const unsigned long long* val);
+extern void e_longint_unsigned_3d(const unsigned long long* val);
+extern void e_pack_struct_0d(const svLogicVecVal* val);
+extern void e_pack_struct_1d(const svLogicVecVal* val);
+extern void e_pack_struct_2d(const svLogicVecVal* val);
+extern void e_pack_struct_3d(const svLogicVecVal* val);
+extern void e_real_0d(double val);
+extern void e_real_1d(const double* val);
+extern void e_real_2d(const double* val);
+extern void e_real_3d(const double* val);
+extern void e_shortint_0d(short val);
+extern void e_shortint_1d(const short* val);
+extern void e_shortint_2d(const short* val);
+extern void e_shortint_3d(const short* val);
+extern void e_shortint_unsigned_0d(unsigned short val);
+extern void e_shortint_unsigned_1d(const unsigned short* val);
+extern void e_shortint_unsigned_2d(const unsigned short* val);
+extern void e_shortint_unsigned_3d(const unsigned short* val);
+extern void e_string_0d(const char* val);
+extern void e_string_1d(const char** val);
+extern void e_string_2d(const char** val);
+extern void e_string_3d(const char** val);
+extern void e_time_0d(const svLogicVecVal* val);
+extern void e_time_1d(const svLogicVecVal* val);
+extern void e_time_2d(const svLogicVecVal* val);
+extern void e_time_3d(const svLogicVecVal* val);
 
- // DPI IMPORTS
- extern void check_exports();
- extern void* get_non_null();
- extern void i_bit121_0d(const svBitVecVal* val);
- extern void i_bit121_1d(const svBitVecVal* val);
- extern void i_bit121_2d(const svBitVecVal* val);
- extern void i_bit121_3d(const svBitVecVal* val);
- extern void i_bit1_0d(svBit val);
- extern void i_bit1_1d(const svBit* val);
- extern void i_bit1_2d(const svBit* val);
- extern void i_bit1_3d(const svBit* val);
- extern void i_bit7_0d(const svBitVecVal* val);
- extern void i_bit7_1d(const svBitVecVal* val);
- extern void i_bit7_2d(const svBitVecVal* val);
- extern void i_bit7_3d(const svBitVecVal* val);
- extern void i_byte_0d(char val);
- extern void i_byte_1d(const char* val);
- extern void i_byte_2d(const char* val);
- extern void i_byte_3d(const char* val);
- extern void i_byte_unsigned_0d(unsigned char val);
- extern void i_byte_unsigned_1d(const unsigned char* val);
- extern void i_byte_unsigned_2d(const unsigned char* val);
- extern void i_byte_unsigned_3d(const unsigned char* val);
- extern void i_chandle_0d(void* val);
- extern void i_chandle_1d(const void** val);
- extern void i_chandle_2d(const void** val);
- extern void i_chandle_3d(const void** val);
- extern void i_int_0d(int val);
- extern void i_int_1d(const int* val);
- extern void i_int_2d(const int* val);
- extern void i_int_3d(const int* val);
- extern void i_int_unsigned_0d(unsigned int val);
- extern void i_int_unsigned_1d(const unsigned int* val);
- extern void i_int_unsigned_2d(const unsigned int* val);
- extern void i_int_unsigned_3d(const unsigned int* val);
- extern void i_integer_0d(const svLogicVecVal* val);
- extern void i_integer_1d(const svLogicVecVal* val);
- extern void i_integer_2d(const svLogicVecVal* val);
- extern void i_integer_3d(const svLogicVecVal* val);
- extern void i_logic121_0d(const svLogicVecVal* val);
- extern void i_logic121_1d(const svLogicVecVal* val);
- extern void i_logic121_2d(const svLogicVecVal* val);
- extern void i_logic121_3d(const svLogicVecVal* val);
- extern void i_logic1_0d(svLogic val);
- extern void i_logic1_1d(const svLogic* val);
- extern void i_logic1_2d(const svLogic* val);
- extern void i_logic1_3d(const svLogic* val);
- extern void i_logic7_0d(const svLogicVecVal* val);
- extern void i_logic7_1d(const svLogicVecVal* val);
- extern void i_logic7_2d(const svLogicVecVal* val);
- extern void i_logic7_3d(const svLogicVecVal* val);
- extern void i_longint_0d(long long val);
- extern void i_longint_1d(const long long* val);
- extern void i_longint_2d(const long long* val);
- extern void i_longint_3d(const long long* val);
- extern void i_longint_unsigned_0d(unsigned long long val);
- extern void i_longint_unsigned_1d(const unsigned long long* val);
- extern void i_longint_unsigned_2d(const unsigned long long* val);
- extern void i_longint_unsigned_3d(const unsigned long long* val);
- extern void i_pack_struct_0d(const svLogicVecVal* val);
- extern void i_pack_struct_1d(const svLogicVecVal* val);
- extern void i_pack_struct_2d(const svLogicVecVal* val);
- extern void i_pack_struct_3d(const svLogicVecVal* val);
- extern void i_real_0d(double val);
- extern void i_real_1d(const double* val);
- extern void i_real_2d(const double* val);
- extern void i_real_3d(const double* val);
- extern void i_shortint_0d(short val);
- extern void i_shortint_1d(const short* val);
- extern void i_shortint_2d(const short* val);
- extern void i_shortint_3d(const short* val);
- extern void i_shortint_unsigned_0d(unsigned short val);
- extern void i_shortint_unsigned_1d(const unsigned short* val);
- extern void i_shortint_unsigned_2d(const unsigned short* val);
- extern void i_shortint_unsigned_3d(const unsigned short* val);
- extern void i_string_0d(const char* val);
- extern void i_string_1d(const char** val);
- extern void i_string_2d(const char** val);
- extern void i_string_3d(const char** val);
- extern void i_time_0d(const svLogicVecVal* val);
- extern void i_time_1d(const svLogicVecVal* val);
- extern void i_time_2d(const svLogicVecVal* val);
- extern void i_time_3d(const svLogicVecVal* val);
+// DPI IMPORTS
+extern void check_exports();
+extern void* get_non_null();
+extern void i_bit121_0d(const svBitVecVal* val);
+extern void i_bit121_1d(const svBitVecVal* val);
+extern void i_bit121_2d(const svBitVecVal* val);
+extern void i_bit121_3d(const svBitVecVal* val);
+extern void i_bit1_0d(svBit val);
+extern void i_bit1_1d(const svBit* val);
+extern void i_bit1_2d(const svBit* val);
+extern void i_bit1_3d(const svBit* val);
+extern void i_bit7_0d(const svBitVecVal* val);
+extern void i_bit7_1d(const svBitVecVal* val);
+extern void i_bit7_2d(const svBitVecVal* val);
+extern void i_bit7_3d(const svBitVecVal* val);
+extern void i_byte_0d(char val);
+extern void i_byte_1d(const char* val);
+extern void i_byte_2d(const char* val);
+extern void i_byte_3d(const char* val);
+extern void i_byte_unsigned_0d(unsigned char val);
+extern void i_byte_unsigned_1d(const unsigned char* val);
+extern void i_byte_unsigned_2d(const unsigned char* val);
+extern void i_byte_unsigned_3d(const unsigned char* val);
+extern void i_chandle_0d(void* val);
+extern void i_chandle_1d(const void** val);
+extern void i_chandle_2d(const void** val);
+extern void i_chandle_3d(const void** val);
+extern void i_int_0d(int val);
+extern void i_int_1d(const int* val);
+extern void i_int_2d(const int* val);
+extern void i_int_3d(const int* val);
+extern void i_int_unsigned_0d(unsigned int val);
+extern void i_int_unsigned_1d(const unsigned int* val);
+extern void i_int_unsigned_2d(const unsigned int* val);
+extern void i_int_unsigned_3d(const unsigned int* val);
+extern void i_integer_0d(const svLogicVecVal* val);
+extern void i_integer_1d(const svLogicVecVal* val);
+extern void i_integer_2d(const svLogicVecVal* val);
+extern void i_integer_3d(const svLogicVecVal* val);
+extern void i_logic121_0d(const svLogicVecVal* val);
+extern void i_logic121_1d(const svLogicVecVal* val);
+extern void i_logic121_2d(const svLogicVecVal* val);
+extern void i_logic121_3d(const svLogicVecVal* val);
+extern void i_logic1_0d(svLogic val);
+extern void i_logic1_1d(const svLogic* val);
+extern void i_logic1_2d(const svLogic* val);
+extern void i_logic1_3d(const svLogic* val);
+extern void i_logic7_0d(const svLogicVecVal* val);
+extern void i_logic7_1d(const svLogicVecVal* val);
+extern void i_logic7_2d(const svLogicVecVal* val);
+extern void i_logic7_3d(const svLogicVecVal* val);
+extern void i_longint_0d(long long val);
+extern void i_longint_1d(const long long* val);
+extern void i_longint_2d(const long long* val);
+extern void i_longint_3d(const long long* val);
+extern void i_longint_unsigned_0d(unsigned long long val);
+extern void i_longint_unsigned_1d(const unsigned long long* val);
+extern void i_longint_unsigned_2d(const unsigned long long* val);
+extern void i_longint_unsigned_3d(const unsigned long long* val);
+extern void i_pack_struct_0d(const svLogicVecVal* val);
+extern void i_pack_struct_1d(const svLogicVecVal* val);
+extern void i_pack_struct_2d(const svLogicVecVal* val);
+extern void i_pack_struct_3d(const svLogicVecVal* val);
+extern void i_real_0d(double val);
+extern void i_real_1d(const double* val);
+extern void i_real_2d(const double* val);
+extern void i_real_3d(const double* val);
+extern void i_shortint_0d(short val);
+extern void i_shortint_1d(const short* val);
+extern void i_shortint_2d(const short* val);
+extern void i_shortint_3d(const short* val);
+extern void i_shortint_unsigned_0d(unsigned short val);
+extern void i_shortint_unsigned_1d(const unsigned short* val);
+extern void i_shortint_unsigned_2d(const unsigned short* val);
+extern void i_shortint_unsigned_3d(const unsigned short* val);
+extern void i_string_0d(const char* val);
+extern void i_string_1d(const char** val);
+extern void i_string_2d(const char** val);
+extern void i_string_3d(const char** val);
+extern void i_time_0d(const svLogicVecVal* val);
+extern void i_time_1d(const svLogicVecVal* val);
+extern void i_time_2d(const svLogicVecVal* val);
+extern void i_time_3d(const svLogicVecVal* val);
 
 #ifdef __cplusplus
 }
diff --git a/test_regress/t/t_dpi_arg_output_type__Dpi.out b/test_regress/t/t_dpi_arg_output_type__Dpi.out
index e84de47c3..37204ecc3 100644
--- a/test_regress/t/t_dpi_arg_output_type__Dpi.out
+++ b/test_regress/t/t_dpi_arg_output_type__Dpi.out
@@ -15,142 +15,142 @@ extern "C" {
 #endif
 
 
- // DPI EXPORTS
- extern void e_array_2_state_1(svBitVecVal* o);
- extern void e_array_2_state_128(svBitVecVal* o);
- extern void e_array_2_state_32(svBitVecVal* o);
- extern void e_array_2_state_33(svBitVecVal* o);
- extern void e_array_2_state_64(svBitVecVal* o);
- extern void e_array_2_state_65(svBitVecVal* o);
- extern void e_array_4_state_1(svLogicVecVal* o);
- extern void e_array_4_state_128(svLogicVecVal* o);
- extern void e_array_4_state_32(svLogicVecVal* o);
- extern void e_array_4_state_33(svLogicVecVal* o);
- extern void e_array_4_state_64(svLogicVecVal* o);
- extern void e_array_4_state_65(svLogicVecVal* o);
- extern void e_bit(svBit* o);
- extern void e_bit_t(svBit* o);
- extern void e_byte(char* o);
- extern void e_byte_t(char* o);
- extern void e_byte_unsigned(unsigned char* o);
- extern void e_byte_unsigned_t(unsigned char* o);
- extern void e_chandle(void** o);
- extern void e_chandle_t(void** o);
- extern void e_int(int* o);
- extern void e_int_t(int* o);
- extern void e_int_unsigned(unsigned int* o);
- extern void e_int_unsigned_t(unsigned int* o);
- extern void e_integer(svLogicVecVal* o);
- extern void e_integer_t(svLogicVecVal* o);
- extern void e_logic(svLogic* o);
- extern void e_logic_t(svLogic* o);
- extern void e_longint(long long* o);
- extern void e_longint_t(long long* o);
- extern void e_longint_unsigned(unsigned long long* o);
- extern void e_longint_unsigned_t(unsigned long long* o);
- extern void e_real(double* o);
- extern void e_real_t(double* o);
- extern void e_shortint(short* o);
- extern void e_shortint_t(short* o);
- extern void e_shortint_unsigned(unsigned short* o);
- extern void e_shortint_unsigned_t(unsigned short* o);
- extern void e_string(const char** o);
- extern void e_string_t(const char** o);
- extern void e_struct_2_state_1(svBitVecVal* o);
- extern void e_struct_2_state_128(svBitVecVal* o);
- extern void e_struct_2_state_32(svBitVecVal* o);
- extern void e_struct_2_state_33(svBitVecVal* o);
- extern void e_struct_2_state_64(svBitVecVal* o);
- extern void e_struct_2_state_65(svBitVecVal* o);
- extern void e_struct_4_state_1(svLogicVecVal* o);
- extern void e_struct_4_state_128(svLogicVecVal* o);
- extern void e_struct_4_state_32(svLogicVecVal* o);
- extern void e_struct_4_state_33(svLogicVecVal* o);
- extern void e_struct_4_state_64(svLogicVecVal* o);
- extern void e_struct_4_state_65(svLogicVecVal* o);
- extern void e_time(svLogicVecVal* o);
- extern void e_time_t(svLogicVecVal* o);
- extern void e_union_2_state_1(svBitVecVal* o);
- extern void e_union_2_state_128(svBitVecVal* o);
- extern void e_union_2_state_32(svBitVecVal* o);
- extern void e_union_2_state_33(svBitVecVal* o);
- extern void e_union_2_state_64(svBitVecVal* o);
- extern void e_union_2_state_65(svBitVecVal* o);
- extern void e_union_4_state_1(svLogicVecVal* o);
- extern void e_union_4_state_128(svLogicVecVal* o);
- extern void e_union_4_state_32(svLogicVecVal* o);
- extern void e_union_4_state_33(svLogicVecVal* o);
- extern void e_union_4_state_64(svLogicVecVal* o);
- extern void e_union_4_state_65(svLogicVecVal* o);
+// DPI EXPORTS
+extern void e_array_2_state_1(svBitVecVal* o);
+extern void e_array_2_state_128(svBitVecVal* o);
+extern void e_array_2_state_32(svBitVecVal* o);
+extern void e_array_2_state_33(svBitVecVal* o);
+extern void e_array_2_state_64(svBitVecVal* o);
+extern void e_array_2_state_65(svBitVecVal* o);
+extern void e_array_4_state_1(svLogicVecVal* o);
+extern void e_array_4_state_128(svLogicVecVal* o);
+extern void e_array_4_state_32(svLogicVecVal* o);
+extern void e_array_4_state_33(svLogicVecVal* o);
+extern void e_array_4_state_64(svLogicVecVal* o);
+extern void e_array_4_state_65(svLogicVecVal* o);
+extern void e_bit(svBit* o);
+extern void e_bit_t(svBit* o);
+extern void e_byte(char* o);
+extern void e_byte_t(char* o);
+extern void e_byte_unsigned(unsigned char* o);
+extern void e_byte_unsigned_t(unsigned char* o);
+extern void e_chandle(void** o);
+extern void e_chandle_t(void** o);
+extern void e_int(int* o);
+extern void e_int_t(int* o);
+extern void e_int_unsigned(unsigned int* o);
+extern void e_int_unsigned_t(unsigned int* o);
+extern void e_integer(svLogicVecVal* o);
+extern void e_integer_t(svLogicVecVal* o);
+extern void e_logic(svLogic* o);
+extern void e_logic_t(svLogic* o);
+extern void e_longint(long long* o);
+extern void e_longint_t(long long* o);
+extern void e_longint_unsigned(unsigned long long* o);
+extern void e_longint_unsigned_t(unsigned long long* o);
+extern void e_real(double* o);
+extern void e_real_t(double* o);
+extern void e_shortint(short* o);
+extern void e_shortint_t(short* o);
+extern void e_shortint_unsigned(unsigned short* o);
+extern void e_shortint_unsigned_t(unsigned short* o);
+extern void e_string(const char** o);
+extern void e_string_t(const char** o);
+extern void e_struct_2_state_1(svBitVecVal* o);
+extern void e_struct_2_state_128(svBitVecVal* o);
+extern void e_struct_2_state_32(svBitVecVal* o);
+extern void e_struct_2_state_33(svBitVecVal* o);
+extern void e_struct_2_state_64(svBitVecVal* o);
+extern void e_struct_2_state_65(svBitVecVal* o);
+extern void e_struct_4_state_1(svLogicVecVal* o);
+extern void e_struct_4_state_128(svLogicVecVal* o);
+extern void e_struct_4_state_32(svLogicVecVal* o);
+extern void e_struct_4_state_33(svLogicVecVal* o);
+extern void e_struct_4_state_64(svLogicVecVal* o);
+extern void e_struct_4_state_65(svLogicVecVal* o);
+extern void e_time(svLogicVecVal* o);
+extern void e_time_t(svLogicVecVal* o);
+extern void e_union_2_state_1(svBitVecVal* o);
+extern void e_union_2_state_128(svBitVecVal* o);
+extern void e_union_2_state_32(svBitVecVal* o);
+extern void e_union_2_state_33(svBitVecVal* o);
+extern void e_union_2_state_64(svBitVecVal* o);
+extern void e_union_2_state_65(svBitVecVal* o);
+extern void e_union_4_state_1(svLogicVecVal* o);
+extern void e_union_4_state_128(svLogicVecVal* o);
+extern void e_union_4_state_32(svLogicVecVal* o);
+extern void e_union_4_state_33(svLogicVecVal* o);
+extern void e_union_4_state_64(svLogicVecVal* o);
+extern void e_union_4_state_65(svLogicVecVal* o);
 
- // DPI IMPORTS
- extern void check_exports();
- extern void i_array_2_state_1(svBitVecVal* o);
- extern void i_array_2_state_128(svBitVecVal* o);
- extern void i_array_2_state_32(svBitVecVal* o);
- extern void i_array_2_state_33(svBitVecVal* o);
- extern void i_array_2_state_64(svBitVecVal* o);
- extern void i_array_2_state_65(svBitVecVal* o);
- extern void i_array_4_state_1(svLogicVecVal* o);
- extern void i_array_4_state_128(svLogicVecVal* o);
- extern void i_array_4_state_32(svLogicVecVal* o);
- extern void i_array_4_state_33(svLogicVecVal* o);
- extern void i_array_4_state_64(svLogicVecVal* o);
- extern void i_array_4_state_65(svLogicVecVal* o);
- extern void i_bit(svBit* o);
- extern void i_bit_t(svBit* o);
- extern void i_byte(char* o);
- extern void i_byte_t(char* o);
- extern void i_byte_unsigned(unsigned char* o);
- extern void i_byte_unsigned_t(unsigned char* o);
- extern void i_chandle(void** o);
- extern void i_chandle_t(void** o);
- extern void i_int(int* o);
- extern void i_int_t(int* o);
- extern void i_int_unsigned(unsigned int* o);
- extern void i_int_unsigned_t(unsigned int* o);
- extern void i_integer(svLogicVecVal* o);
- extern void i_integer_t(svLogicVecVal* o);
- extern void i_logic(svLogic* o);
- extern void i_logic_t(svLogic* o);
- extern void i_longint(long long* o);
- extern void i_longint_t(long long* o);
- extern void i_longint_unsigned(unsigned long long* o);
- extern void i_longint_unsigned_t(unsigned long long* o);
- extern void i_real(double* o);
- extern void i_real_t(double* o);
- extern void i_shortint(short* o);
- extern void i_shortint_t(short* o);
- extern void i_shortint_unsigned(unsigned short* o);
- extern void i_shortint_unsigned_t(unsigned short* o);
- extern void i_string(const char** o);
- extern void i_string_t(const char** o);
- extern void i_struct_2_state_1(svBitVecVal* o);
- extern void i_struct_2_state_128(svBitVecVal* o);
- extern void i_struct_2_state_32(svBitVecVal* o);
- extern void i_struct_2_state_33(svBitVecVal* o);
- extern void i_struct_2_state_64(svBitVecVal* o);
- extern void i_struct_2_state_65(svBitVecVal* o);
- extern void i_struct_4_state_1(svLogicVecVal* o);
- extern void i_struct_4_state_128(svLogicVecVal* o);
- extern void i_struct_4_state_32(svLogicVecVal* o);
- extern void i_struct_4_state_33(svLogicVecVal* o);
- extern void i_struct_4_state_64(svLogicVecVal* o);
- extern void i_struct_4_state_65(svLogicVecVal* o);
- extern void i_time(svLogicVecVal* o);
- extern void i_time_t(svLogicVecVal* o);
- extern void i_union_2_state_1(svBitVecVal* o);
- extern void i_union_2_state_128(svBitVecVal* o);
- extern void i_union_2_state_32(svBitVecVal* o);
- extern void i_union_2_state_33(svBitVecVal* o);
- extern void i_union_2_state_64(svBitVecVal* o);
- extern void i_union_2_state_65(svBitVecVal* o);
- extern void i_union_4_state_1(svLogicVecVal* o);
- extern void i_union_4_state_128(svLogicVecVal* o);
- extern void i_union_4_state_32(svLogicVecVal* o);
- extern void i_union_4_state_33(svLogicVecVal* o);
- extern void i_union_4_state_64(svLogicVecVal* o);
- extern void i_union_4_state_65(svLogicVecVal* o);
+// DPI IMPORTS
+extern void check_exports();
+extern void i_array_2_state_1(svBitVecVal* o);
+extern void i_array_2_state_128(svBitVecVal* o);
+extern void i_array_2_state_32(svBitVecVal* o);
+extern void i_array_2_state_33(svBitVecVal* o);
+extern void i_array_2_state_64(svBitVecVal* o);
+extern void i_array_2_state_65(svBitVecVal* o);
+extern void i_array_4_state_1(svLogicVecVal* o);
+extern void i_array_4_state_128(svLogicVecVal* o);
+extern void i_array_4_state_32(svLogicVecVal* o);
+extern void i_array_4_state_33(svLogicVecVal* o);
+extern void i_array_4_state_64(svLogicVecVal* o);
+extern void i_array_4_state_65(svLogicVecVal* o);
+extern void i_bit(svBit* o);
+extern void i_bit_t(svBit* o);
+extern void i_byte(char* o);
+extern void i_byte_t(char* o);
+extern void i_byte_unsigned(unsigned char* o);
+extern void i_byte_unsigned_t(unsigned char* o);
+extern void i_chandle(void** o);
+extern void i_chandle_t(void** o);
+extern void i_int(int* o);
+extern void i_int_t(int* o);
+extern void i_int_unsigned(unsigned int* o);
+extern void i_int_unsigned_t(unsigned int* o);
+extern void i_integer(svLogicVecVal* o);
+extern void i_integer_t(svLogicVecVal* o);
+extern void i_logic(svLogic* o);
+extern void i_logic_t(svLogic* o);
+extern void i_longint(long long* o);
+extern void i_longint_t(long long* o);
+extern void i_longint_unsigned(unsigned long long* o);
+extern void i_longint_unsigned_t(unsigned long long* o);
+extern void i_real(double* o);
+extern void i_real_t(double* o);
+extern void i_shortint(short* o);
+extern void i_shortint_t(short* o);
+extern void i_shortint_unsigned(unsigned short* o);
+extern void i_shortint_unsigned_t(unsigned short* o);
+extern void i_string(const char** o);
+extern void i_string_t(const char** o);
+extern void i_struct_2_state_1(svBitVecVal* o);
+extern void i_struct_2_state_128(svBitVecVal* o);
+extern void i_struct_2_state_32(svBitVecVal* o);
+extern void i_struct_2_state_33(svBitVecVal* o);
+extern void i_struct_2_state_64(svBitVecVal* o);
+extern void i_struct_2_state_65(svBitVecVal* o);
+extern void i_struct_4_state_1(svLogicVecVal* o);
+extern void i_struct_4_state_128(svLogicVecVal* o);
+extern void i_struct_4_state_32(svLogicVecVal* o);
+extern void i_struct_4_state_33(svLogicVecVal* o);
+extern void i_struct_4_state_64(svLogicVecVal* o);
+extern void i_struct_4_state_65(svLogicVecVal* o);
+extern void i_time(svLogicVecVal* o);
+extern void i_time_t(svLogicVecVal* o);
+extern void i_union_2_state_1(svBitVecVal* o);
+extern void i_union_2_state_128(svBitVecVal* o);
+extern void i_union_2_state_32(svBitVecVal* o);
+extern void i_union_2_state_33(svBitVecVal* o);
+extern void i_union_2_state_64(svBitVecVal* o);
+extern void i_union_2_state_65(svBitVecVal* o);
+extern void i_union_4_state_1(svLogicVecVal* o);
+extern void i_union_4_state_128(svLogicVecVal* o);
+extern void i_union_4_state_32(svLogicVecVal* o);
+extern void i_union_4_state_33(svLogicVecVal* o);
+extern void i_union_4_state_64(svLogicVecVal* o);
+extern void i_union_4_state_65(svLogicVecVal* o);
 
 #ifdef __cplusplus
 }
diff --git a/test_regress/t/t_dpi_arg_output_unpack__Dpi.out b/test_regress/t/t_dpi_arg_output_unpack__Dpi.out
index ddcd704de..623bdc509 100644
--- a/test_regress/t/t_dpi_arg_output_unpack__Dpi.out
+++ b/test_regress/t/t_dpi_arg_output_unpack__Dpi.out
@@ -15,171 +15,171 @@ extern "C" {
 #endif
 
 
- // DPI EXPORTS
- extern void e_bit121_0d(svBitVecVal* val);
- extern void e_bit121_1d(svBitVecVal* val);
- extern void e_bit121_2d(svBitVecVal* val);
- extern void e_bit121_3d(svBitVecVal* val);
- extern void e_bit1_0d(svBit* val);
- extern void e_bit1_1d(svBit* val);
- extern void e_bit1_2d(svBit* val);
- extern void e_bit1_3d(svBitVecVal* val);
- extern void e_bit7_0d(svBitVecVal* val);
- extern void e_bit7_1d(svBitVecVal* val);
- extern void e_bit7_2d(svBitVecVal* val);
- extern void e_bit7_3d(svBitVecVal* val);
- extern void e_byte_0d(char* val);
- extern void e_byte_1d(char* val);
- extern void e_byte_2d(char* val);
- extern void e_byte_3d(char* val);
- extern void e_byte_unsigned_0d(unsigned char* val);
- extern void e_byte_unsigned_1d(unsigned char* val);
- extern void e_byte_unsigned_2d(unsigned char* val);
- extern void e_byte_unsigned_3d(unsigned char* val);
- extern void e_chandle_0d(void** val);
- extern void e_chandle_1d(void** val);
- extern void e_chandle_2d(void** val);
- extern void e_chandle_3d(void** val);
- extern void e_int_0d(int* val);
- extern void e_int_1d(int* val);
- extern void e_int_2d(int* val);
- extern void e_int_3d(int* val);
- extern void e_int_unsigned_0d(unsigned int* val);
- extern void e_int_unsigned_1d(unsigned int* val);
- extern void e_int_unsigned_2d(unsigned int* val);
- extern void e_int_unsigned_3d(unsigned int* val);
- extern void e_integer_0d(svLogicVecVal* val);
- extern void e_integer_1d(svLogicVecVal* val);
- extern void e_integer_2d(svLogicVecVal* val);
- extern void e_integer_3d(svLogicVecVal* val);
- extern void e_logic121_0d(svLogicVecVal* val);
- extern void e_logic121_1d(svLogicVecVal* val);
- extern void e_logic121_2d(svLogicVecVal* val);
- extern void e_logic121_3d(svLogicVecVal* val);
- extern void e_logic1_0d(svLogic* val);
- extern void e_logic1_1d(svLogic* val);
- extern void e_logic1_2d(svLogic* val);
- extern void e_logic1_3d(svLogicVecVal* val);
- extern void e_logic7_0d(svLogicVecVal* val);
- extern void e_logic7_1d(svLogicVecVal* val);
- extern void e_logic7_2d(svLogicVecVal* val);
- extern void e_logic7_3d(svLogicVecVal* val);
- extern void e_longint_0d(long long* val);
- extern void e_longint_1d(long long* val);
- extern void e_longint_2d(long long* val);
- extern void e_longint_3d(long long* val);
- extern void e_longint_unsigned_0d(unsigned long long* val);
- extern void e_longint_unsigned_1d(unsigned long long* val);
- extern void e_longint_unsigned_2d(unsigned long long* val);
- extern void e_longint_unsigned_3d(unsigned long long* val);
- extern void e_pack_struct_0d(svLogicVecVal* val);
- extern void e_pack_struct_1d(svLogicVecVal* val);
- extern void e_pack_struct_2d(svLogicVecVal* val);
- extern void e_pack_struct_3d(svLogicVecVal* val);
- extern void e_real_0d(double* val);
- extern void e_real_1d(double* val);
- extern void e_real_2d(double* val);
- extern void e_real_3d(double* val);
- extern void e_shortint_0d(short* val);
- extern void e_shortint_1d(short* val);
- extern void e_shortint_2d(short* val);
- extern void e_shortint_3d(short* val);
- extern void e_shortint_unsigned_0d(unsigned short* val);
- extern void e_shortint_unsigned_1d(unsigned short* val);
- extern void e_shortint_unsigned_2d(unsigned short* val);
- extern void e_shortint_unsigned_3d(unsigned short* val);
- extern void e_string_0d(const char** val);
- extern void e_string_1d(const char** val);
- extern void e_string_2d(const char** val);
- extern void e_string_3d(const char** val);
- extern void e_time_0d(svLogicVecVal* val);
- extern void e_time_1d(svLogicVecVal* val);
- extern void e_time_2d(svLogicVecVal* val);
- extern void e_time_3d(svLogicVecVal* val);
+// DPI EXPORTS
+extern void e_bit121_0d(svBitVecVal* val);
+extern void e_bit121_1d(svBitVecVal* val);
+extern void e_bit121_2d(svBitVecVal* val);
+extern void e_bit121_3d(svBitVecVal* val);
+extern void e_bit1_0d(svBit* val);
+extern void e_bit1_1d(svBit* val);
+extern void e_bit1_2d(svBit* val);
+extern void e_bit1_3d(svBitVecVal* val);
+extern void e_bit7_0d(svBitVecVal* val);
+extern void e_bit7_1d(svBitVecVal* val);
+extern void e_bit7_2d(svBitVecVal* val);
+extern void e_bit7_3d(svBitVecVal* val);
+extern void e_byte_0d(char* val);
+extern void e_byte_1d(char* val);
+extern void e_byte_2d(char* val);
+extern void e_byte_3d(char* val);
+extern void e_byte_unsigned_0d(unsigned char* val);
+extern void e_byte_unsigned_1d(unsigned char* val);
+extern void e_byte_unsigned_2d(unsigned char* val);
+extern void e_byte_unsigned_3d(unsigned char* val);
+extern void e_chandle_0d(void** val);
+extern void e_chandle_1d(void** val);
+extern void e_chandle_2d(void** val);
+extern void e_chandle_3d(void** val);
+extern void e_int_0d(int* val);
+extern void e_int_1d(int* val);
+extern void e_int_2d(int* val);
+extern void e_int_3d(int* val);
+extern void e_int_unsigned_0d(unsigned int* val);
+extern void e_int_unsigned_1d(unsigned int* val);
+extern void e_int_unsigned_2d(unsigned int* val);
+extern void e_int_unsigned_3d(unsigned int* val);
+extern void e_integer_0d(svLogicVecVal* val);
+extern void e_integer_1d(svLogicVecVal* val);
+extern void e_integer_2d(svLogicVecVal* val);
+extern void e_integer_3d(svLogicVecVal* val);
+extern void e_logic121_0d(svLogicVecVal* val);
+extern void e_logic121_1d(svLogicVecVal* val);
+extern void e_logic121_2d(svLogicVecVal* val);
+extern void e_logic121_3d(svLogicVecVal* val);
+extern void e_logic1_0d(svLogic* val);
+extern void e_logic1_1d(svLogic* val);
+extern void e_logic1_2d(svLogic* val);
+extern void e_logic1_3d(svLogicVecVal* val);
+extern void e_logic7_0d(svLogicVecVal* val);
+extern void e_logic7_1d(svLogicVecVal* val);
+extern void e_logic7_2d(svLogicVecVal* val);
+extern void e_logic7_3d(svLogicVecVal* val);
+extern void e_longint_0d(long long* val);
+extern void e_longint_1d(long long* val);
+extern void e_longint_2d(long long* val);
+extern void e_longint_3d(long long* val);
+extern void e_longint_unsigned_0d(unsigned long long* val);
+extern void e_longint_unsigned_1d(unsigned long long* val);
+extern void e_longint_unsigned_2d(unsigned long long* val);
+extern void e_longint_unsigned_3d(unsigned long long* val);
+extern void e_pack_struct_0d(svLogicVecVal* val);
+extern void e_pack_struct_1d(svLogicVecVal* val);
+extern void e_pack_struct_2d(svLogicVecVal* val);
+extern void e_pack_struct_3d(svLogicVecVal* val);
+extern void e_real_0d(double* val);
+extern void e_real_1d(double* val);
+extern void e_real_2d(double* val);
+extern void e_real_3d(double* val);
+extern void e_shortint_0d(short* val);
+extern void e_shortint_1d(short* val);
+extern void e_shortint_2d(short* val);
+extern void e_shortint_3d(short* val);
+extern void e_shortint_unsigned_0d(unsigned short* val);
+extern void e_shortint_unsigned_1d(unsigned short* val);
+extern void e_shortint_unsigned_2d(unsigned short* val);
+extern void e_shortint_unsigned_3d(unsigned short* val);
+extern void e_string_0d(const char** val);
+extern void e_string_1d(const char** val);
+extern void e_string_2d(const char** val);
+extern void e_string_3d(const char** val);
+extern void e_time_0d(svLogicVecVal* val);
+extern void e_time_1d(svLogicVecVal* val);
+extern void e_time_2d(svLogicVecVal* val);
+extern void e_time_3d(svLogicVecVal* val);
 
- // DPI IMPORTS
- extern void check_exports();
- extern void* get_non_null();
- extern void i_bit121_0d(svBitVecVal* val);
- extern void i_bit121_1d(svBitVecVal* val);
- extern void i_bit121_2d(svBitVecVal* val);
- extern void i_bit121_3d(svBitVecVal* val);
- extern void i_bit1_0d(svBit* val);
- extern void i_bit1_1d(svBit* val);
- extern void i_bit1_2d(svBit* val);
- extern void i_bit1_3d(svBit* val);
- extern void i_bit7_0d(svBitVecVal* val);
- extern void i_bit7_1d(svBitVecVal* val);
- extern void i_bit7_2d(svBitVecVal* val);
- extern void i_bit7_3d(svBitVecVal* val);
- extern void i_byte_0d(char* val);
- extern void i_byte_1d(char* val);
- extern void i_byte_2d(char* val);
- extern void i_byte_3d(char* val);
- extern void i_byte_unsigned_0d(unsigned char* val);
- extern void i_byte_unsigned_1d(unsigned char* val);
- extern void i_byte_unsigned_2d(unsigned char* val);
- extern void i_byte_unsigned_3d(unsigned char* val);
- extern void i_chandle_0d(void** val);
- extern void i_chandle_1d(void** val);
- extern void i_chandle_2d(void** val);
- extern void i_chandle_3d(void** val);
- extern void i_int_0d(int* val);
- extern void i_int_1d(int* val);
- extern void i_int_2d(int* val);
- extern void i_int_3d(int* val);
- extern void i_int_unsigned_0d(unsigned int* val);
- extern void i_int_unsigned_1d(unsigned int* val);
- extern void i_int_unsigned_2d(unsigned int* val);
- extern void i_int_unsigned_3d(unsigned int* val);
- extern void i_integer_0d(svLogicVecVal* val);
- extern void i_integer_1d(svLogicVecVal* val);
- extern void i_integer_2d(svLogicVecVal* val);
- extern void i_integer_3d(svLogicVecVal* val);
- extern void i_logic121_0d(svLogicVecVal* val);
- extern void i_logic121_1d(svLogicVecVal* val);
- extern void i_logic121_2d(svLogicVecVal* val);
- extern void i_logic121_3d(svLogicVecVal* val);
- extern void i_logic1_0d(svLogic* val);
- extern void i_logic1_1d(svLogic* val);
- extern void i_logic1_2d(svLogic* val);
- extern void i_logic1_3d(svLogic* val);
- extern void i_logic7_0d(svLogicVecVal* val);
- extern void i_logic7_1d(svLogicVecVal* val);
- extern void i_logic7_2d(svLogicVecVal* val);
- extern void i_logic7_3d(svLogicVecVal* val);
- extern void i_longint_0d(long long* val);
- extern void i_longint_1d(long long* val);
- extern void i_longint_2d(long long* val);
- extern void i_longint_3d(long long* val);
- extern void i_longint_unsigned_0d(unsigned long long* val);
- extern void i_longint_unsigned_1d(unsigned long long* val);
- extern void i_longint_unsigned_2d(unsigned long long* val);
- extern void i_longint_unsigned_3d(unsigned long long* val);
- extern void i_pack_struct_0d(svLogicVecVal* val);
- extern void i_pack_struct_1d(svLogicVecVal* val);
- extern void i_pack_struct_2d(svLogicVecVal* val);
- extern void i_pack_struct_3d(svLogicVecVal* val);
- extern void i_real_0d(double* val);
- extern void i_real_1d(double* val);
- extern void i_real_2d(double* val);
- extern void i_real_3d(double* val);
- extern void i_shortint_0d(short* val);
- extern void i_shortint_1d(short* val);
- extern void i_shortint_2d(short* val);
- extern void i_shortint_3d(short* val);
- extern void i_shortint_unsigned_0d(unsigned short* val);
- extern void i_shortint_unsigned_1d(unsigned short* val);
- extern void i_shortint_unsigned_2d(unsigned short* val);
- extern void i_shortint_unsigned_3d(unsigned short* val);
- extern void i_string_0d(const char** val);
- extern void i_string_1d(const char** val);
- extern void i_string_2d(const char** val);
- extern void i_string_3d(const char** val);
- extern void i_time_0d(svLogicVecVal* val);
- extern void i_time_1d(svLogicVecVal* val);
- extern void i_time_2d(svLogicVecVal* val);
- extern void i_time_3d(svLogicVecVal* val);
+// DPI IMPORTS
+extern void check_exports();
+extern void* get_non_null();
+extern void i_bit121_0d(svBitVecVal* val);
+extern void i_bit121_1d(svBitVecVal* val);
+extern void i_bit121_2d(svBitVecVal* val);
+extern void i_bit121_3d(svBitVecVal* val);
+extern void i_bit1_0d(svBit* val);
+extern void i_bit1_1d(svBit* val);
+extern void i_bit1_2d(svBit* val);
+extern void i_bit1_3d(svBit* val);
+extern void i_bit7_0d(svBitVecVal* val);
+extern void i_bit7_1d(svBitVecVal* val);
+extern void i_bit7_2d(svBitVecVal* val);
+extern void i_bit7_3d(svBitVecVal* val);
+extern void i_byte_0d(char* val);
+extern void i_byte_1d(char* val);
+extern void i_byte_2d(char* val);
+extern void i_byte_3d(char* val);
+extern void i_byte_unsigned_0d(unsigned char* val);
+extern void i_byte_unsigned_1d(unsigned char* val);
+extern void i_byte_unsigned_2d(unsigned char* val);
+extern void i_byte_unsigned_3d(unsigned char* val);
+extern void i_chandle_0d(void** val);
+extern void i_chandle_1d(void** val);
+extern void i_chandle_2d(void** val);
+extern void i_chandle_3d(void** val);
+extern void i_int_0d(int* val);
+extern void i_int_1d(int* val);
+extern void i_int_2d(int* val);
+extern void i_int_3d(int* val);
+extern void i_int_unsigned_0d(unsigned int* val);
+extern void i_int_unsigned_1d(unsigned int* val);
+extern void i_int_unsigned_2d(unsigned int* val);
+extern void i_int_unsigned_3d(unsigned int* val);
+extern void i_integer_0d(svLogicVecVal* val);
+extern void i_integer_1d(svLogicVecVal* val);
+extern void i_integer_2d(svLogicVecVal* val);
+extern void i_integer_3d(svLogicVecVal* val);
+extern void i_logic121_0d(svLogicVecVal* val);
+extern void i_logic121_1d(svLogicVecVal* val);
+extern void i_logic121_2d(svLogicVecVal* val);
+extern void i_logic121_3d(svLogicVecVal* val);
+extern void i_logic1_0d(svLogic* val);
+extern void i_logic1_1d(svLogic* val);
+extern void i_logic1_2d(svLogic* val);
+extern void i_logic1_3d(svLogic* val);
+extern void i_logic7_0d(svLogicVecVal* val);
+extern void i_logic7_1d(svLogicVecVal* val);
+extern void i_logic7_2d(svLogicVecVal* val);
+extern void i_logic7_3d(svLogicVecVal* val);
+extern void i_longint_0d(long long* val);
+extern void i_longint_1d(long long* val);
+extern void i_longint_2d(long long* val);
+extern void i_longint_3d(long long* val);
+extern void i_longint_unsigned_0d(unsigned long long* val);
+extern void i_longint_unsigned_1d(unsigned long long* val);
+extern void i_longint_unsigned_2d(unsigned long long* val);
+extern void i_longint_unsigned_3d(unsigned long long* val);
+extern void i_pack_struct_0d(svLogicVecVal* val);
+extern void i_pack_struct_1d(svLogicVecVal* val);
+extern void i_pack_struct_2d(svLogicVecVal* val);
+extern void i_pack_struct_3d(svLogicVecVal* val);
+extern void i_real_0d(double* val);
+extern void i_real_1d(double* val);
+extern void i_real_2d(double* val);
+extern void i_real_3d(double* val);
+extern void i_shortint_0d(short* val);
+extern void i_shortint_1d(short* val);
+extern void i_shortint_2d(short* val);
+extern void i_shortint_3d(short* val);
+extern void i_shortint_unsigned_0d(unsigned short* val);
+extern void i_shortint_unsigned_1d(unsigned short* val);
+extern void i_shortint_unsigned_2d(unsigned short* val);
+extern void i_shortint_unsigned_3d(unsigned short* val);
+extern void i_string_0d(const char** val);
+extern void i_string_1d(const char** val);
+extern void i_string_2d(const char** val);
+extern void i_string_3d(const char** val);
+extern void i_time_0d(svLogicVecVal* val);
+extern void i_time_1d(svLogicVecVal* val);
+extern void i_time_2d(svLogicVecVal* val);
+extern void i_time_3d(svLogicVecVal* val);
 
 #ifdef __cplusplus
 }
diff --git a/test_regress/t/t_dpi_result_type__Dpi.out b/test_regress/t/t_dpi_result_type__Dpi.out
index 344971158..0781f476d 100644
--- a/test_regress/t/t_dpi_result_type__Dpi.out
+++ b/test_regress/t/t_dpi_result_type__Dpi.out
@@ -15,76 +15,76 @@ extern "C" {
 #endif
 
 
- // DPI EXPORTS
- extern svBitVecVal e_array_2_state_1();
- extern svBitVecVal e_array_2_state_32();
- extern svBit e_bit();
- extern svBit e_bit_t();
- extern char e_byte();
- extern char e_byte_t();
- extern unsigned char e_byte_unsigned();
- extern unsigned char e_byte_unsigned_t();
- extern void* e_chandle();
- extern void* e_chandle_t();
- extern int e_int();
- extern int e_int_t();
- extern unsigned int e_int_unsigned();
- extern unsigned int e_int_unsigned_t();
- extern svLogic e_logic();
- extern svLogic e_logic_t();
- extern long long e_longint();
- extern long long e_longint_t();
- extern unsigned long long e_longint_unsigned();
- extern unsigned long long e_longint_unsigned_t();
- extern double e_real();
- extern double e_real_t();
- extern short e_shortint();
- extern short e_shortint_t();
- extern unsigned short e_shortint_unsigned();
- extern unsigned short e_shortint_unsigned_t();
- extern const char* e_string();
- extern const char* e_string_t();
- extern svBitVecVal e_struct_2_state_1();
- extern svBitVecVal e_struct_2_state_32();
- extern svBitVecVal e_union_2_state_1();
- extern svBitVecVal e_union_2_state_32();
- extern void e_void();
+// DPI EXPORTS
+extern svBitVecVal e_array_2_state_1();
+extern svBitVecVal e_array_2_state_32();
+extern svBit e_bit();
+extern svBit e_bit_t();
+extern char e_byte();
+extern char e_byte_t();
+extern unsigned char e_byte_unsigned();
+extern unsigned char e_byte_unsigned_t();
+extern void* e_chandle();
+extern void* e_chandle_t();
+extern int e_int();
+extern int e_int_t();
+extern unsigned int e_int_unsigned();
+extern unsigned int e_int_unsigned_t();
+extern svLogic e_logic();
+extern svLogic e_logic_t();
+extern long long e_longint();
+extern long long e_longint_t();
+extern unsigned long long e_longint_unsigned();
+extern unsigned long long e_longint_unsigned_t();
+extern double e_real();
+extern double e_real_t();
+extern short e_shortint();
+extern short e_shortint_t();
+extern unsigned short e_shortint_unsigned();
+extern unsigned short e_shortint_unsigned_t();
+extern const char* e_string();
+extern const char* e_string_t();
+extern svBitVecVal e_struct_2_state_1();
+extern svBitVecVal e_struct_2_state_32();
+extern svBitVecVal e_union_2_state_1();
+extern svBitVecVal e_union_2_state_32();
+extern void e_void();
 
- // DPI IMPORTS
- extern void check_exports();
- extern svBitVecVal i_array_2_state_1();
- extern svBitVecVal i_array_2_state_32();
- extern svBit i_bit();
- extern svBit i_bit_t();
- extern char i_byte();
- extern char i_byte_t();
- extern unsigned char i_byte_unsigned();
- extern unsigned char i_byte_unsigned_t();
- extern void* i_chandle();
- extern void* i_chandle_t();
- extern int i_int();
- extern int i_int_t();
- extern unsigned int i_int_unsigned();
- extern unsigned int i_int_unsigned_t();
- extern svLogic i_logic();
- extern svLogic i_logic_t();
- extern long long i_longint();
- extern long long i_longint_t();
- extern unsigned long long i_longint_unsigned();
- extern unsigned long long i_longint_unsigned_t();
- extern double i_real();
- extern double i_real_t();
- extern short i_shortint();
- extern short i_shortint_t();
- extern unsigned short i_shortint_unsigned();
- extern unsigned short i_shortint_unsigned_t();
- extern const char* i_string();
- extern const char* i_string_t();
- extern svBitVecVal i_struct_2_state_1();
- extern svBitVecVal i_struct_2_state_32();
- extern svBitVecVal i_union_2_state_1();
- extern svBitVecVal i_union_2_state_32();
- extern void i_void();
+// DPI IMPORTS
+extern void check_exports();
+extern svBitVecVal i_array_2_state_1();
+extern svBitVecVal i_array_2_state_32();
+extern svBit i_bit();
+extern svBit i_bit_t();
+extern char i_byte();
+extern char i_byte_t();
+extern unsigned char i_byte_unsigned();
+extern unsigned char i_byte_unsigned_t();
+extern void* i_chandle();
+extern void* i_chandle_t();
+extern int i_int();
+extern int i_int_t();
+extern unsigned int i_int_unsigned();
+extern unsigned int i_int_unsigned_t();
+extern svLogic i_logic();
+extern svLogic i_logic_t();
+extern long long i_longint();
+extern long long i_longint_t();
+extern unsigned long long i_longint_unsigned();
+extern unsigned long long i_longint_unsigned_t();
+extern double i_real();
+extern double i_real_t();
+extern short i_shortint();
+extern short i_shortint_t();
+extern unsigned short i_shortint_unsigned();
+extern unsigned short i_shortint_unsigned_t();
+extern const char* i_string();
+extern const char* i_string_t();
+extern svBitVecVal i_struct_2_state_1();
+extern svBitVecVal i_struct_2_state_32();
+extern svBitVecVal i_union_2_state_1();
+extern svBitVecVal i_union_2_state_32();
+extern void i_void();
 
 #ifdef __cplusplus
 }