commit 34067de161e6174e7a2d6b43738bcc5f3b003358
author Keun Soo Yim <yim@google.com> Tue May 17 09:46:37 2016 -0700
committer Keun Soo Yim <yim@google.com> Tue May 17 11:28:22 2016 -0700
tree 59c86ff7712ca3da81999c711b287ed966ccfd6c
parent 38455b25219fd1eb72bca441452b0b79378cbc9a

Pass args from the host when calling a HAL API and package the return
message

Change-Id: I2cae0d235431df8783013872d7c0cc91dcda6650

sysfuzzer/vtscompiler/code_gen/HalCodeGen.cpp

diff --git a/sysfuzzer/vtscompiler/code_gen/HalCodeGen.cpp b/sysfuzzer/vtscompiler/code_gen/HalCodeGen.cpp
index f71ec53..0d3ddb8 100644
--- a/sysfuzzer/vtscompiler/code_gen/HalCodeGen.cpp
+++ b/sysfuzzer/vtscompiler/code_gen/HalCodeGen.cpp
@@ -45,8 +45,6 @@
   cpp_ss << "  cout << \"Function: \" << func_name << endl;" << endl;
 
   for (auto const& api : message.api()) {
-    std::stringstream ss;
-
     cpp_ss << "  if (!strcmp(func_name, \"" << api.name() << "\")) {" << endl;
 
     // args - definition;
@@ -62,7 +60,14 @@
         cpp_ss << "reinterpret_cast<" << GetCppVariableType(arg) << ">("
             << kInstanceVariableName << ")";
       } else {
-        cpp_ss << GetCppInstanceType(arg);
+        std::stringstream msg_ss;
+        msg_ss << "func_msg.arg(" << arg_count << ")";
+        string msg = msg_ss.str();
+
+        cpp_ss << "(" << msg << ".primitive_value_size() > 0 ";
+        cpp_ss << "|| " << msg << ".aggregate_value_size() > 0)? ";
+        cpp_ss << GetCppInstanceType(arg, msg);
+        cpp_ss << " : " << GetCppInstanceType(arg);
       }
       cpp_ss << ";" << endl;
       cpp_ss << "    cout << \"arg" << arg_count << " = \" << arg" << arg_count
@@ -93,7 +98,7 @@
       cpp_ss << "))";
     }
     cpp_ss << ");" << endl;
-
+    cpp_ss << "cout << \"called\" << endl;" << endl;
     cpp_ss << "    return true;" << endl;
     cpp_ss << "  }" << endl;
   }