Exploring Interesting Avenues

donn · Aug 12, 2017 · eb647be · eb647be
1 parent ee60491
commit eb647be
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/Swiftlog/Procedure.swift b/Swiftlog/Procedure.swift
@@ -101,7 +101,7 @@ public class Procedure
         let pointers = self.name.cPointer
         self.cNameSize = pointers.elementCount
         self.cNamePointer = pointers.mutable
-        self.store.tfname = pointers.literal
+        self.store.tfname = pointers.cLiteral
 
         self.store.type = PLI_INT32(self.type.rawValue)
         self.store.compiletf = {

diff --git a/Swiftlog/Swiftlog.swift b/Swiftlog/Swiftlog.swift
@@ -12,9 +12,10 @@ func startup()
     //Register Function "$hello_world"
     var helloWorld = s_vpi_systf_data()
     helloWorld.type = vpiSysTask
-    helloWorld.tfname = "$hello_world".cPointer.literal
+    helloWorld.tfname = "$hello_world".cPointer.cLiteral
     helloWorld.calltf  = {
         (user_data: UnsafeMutablePointer<Int8>?) -> Int32 in
+        print(user_data?.pointee)
         print("...and Hello from Swift!")
         return 0
     }
@@ -23,13 +24,13 @@ func startup()
         return 0
     }
     helloWorld.sizetf = nil
-    helloWorld.user_data = nil
+    helloWorld.user_data = "scrambld, egge".cPointer.cMutable
     vpi_register_systf(&helloWorld);
 
     //Register Function "$hello_world"
     var showResult = s_vpi_systf_data();
     showResult.type = vpiSysTask
-    showResult.tfname = "$show_result".cPointer.literal
+    showResult.tfname = "$show_result".cPointer.cLiteral
     showResult.compiletf =
     {
         (user_data: UnsafeMutablePointer<Int8>?) -> Int32 in

diff --git a/Swiftlog/Utils.swift b/Swiftlog/Utils.swift
@@ -11,12 +11,13 @@ class Control
 
 extension String
 {
-    var cPointer: (literal: UnsafePointer<CChar>, mutable: UnsafeMutablePointer<UInt8>, elementCount: Int)
+    var cPointer: (cLiteral: UnsafePointer<CChar>, cMutable: UnsafeMutablePointer<CChar>, mutable: UnsafeMutablePointer<UInt8>, elementCount: Int)
     {
         let utf8Representation = Array(self.utf8)
         let mutablePointer = UnsafeMutablePointer<UInt8>.allocate(capacity: utf8Representation.count)
+        let cMutablePointer = UnsafeMutableRawPointer(mutablePointer).bindMemory(to: CChar.self, capacity: utf8Representation.count)
         let immutablePointer = UnsafeRawPointer(mutablePointer).bindMemory(to: CChar.self, capacity: utf8Representation.count)       
         let _ = UnsafeMutableBufferPointer<UInt8>(start: mutablePointer, count: utf8Representation.count).initialize(from: utf8Representation)
-        return (literal: immutablePointer, mutable: mutablePointer, elementCount: utf8Representation.count)
+        return (cLiteral: immutablePointer, cMutable: cMutablePointer, mutable: mutablePointer, elementCount: utf8Representation.count)
     }
 }