RTL function BitStream_GetLength is always generated even if it is no…

…t used by the generated sources
esa · Jan 2, 2024 · 60bd963 · 60bd963
1 parent 1ddce9c
commit 60bd963
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/FrontEndAst/Language.fs b/FrontEndAst/Language.fs
@@ -70,6 +70,8 @@ type ILangGeneric () =
     abstract member BodyExtention : string
 
     abstract member RtlFuncNames : string list
+    abstract member AlwaysPresentRtlFuncNames : string list
+
     abstract member detectFunctionCalls : string -> string -> string list
     abstract member removeFunctionFromHeader : string -> string -> string 
     abstract member removeFunctionFromBody : string -> string -> string
@@ -154,6 +156,7 @@ type ILangGeneric () =
     default this.requiresHandlingOfEmptySequences = false
     default this.requiresHandlingOfZeroArrays = false
     default this.RtlFuncNames = []
+    default this.AlwaysPresentRtlFuncNames = []
     default this.detectFunctionCalls (sourceCode: string) (functionName: string) = []
     default this.removeFunctionFromHeader (sourceCode: string) (functionName: string) : string =
         sourceCode

diff --git a/StgC/LangGeneric_c.fs b/StgC/LangGeneric_c.fs
@@ -356,7 +356,15 @@ type LangGeneric_c() =
 
             CreateCMainFile r  di.srcDir
             generateVisualStudtioProject r di.srcDir (arrsSrcTstFiles, arrsHdrTstFiles)
-
+        //AlwaysPresentRtlFuncNames
+        override this.AlwaysPresentRtlFuncNames : string list =
+            [
+                "ByteStream_GetLength"
+                "BitStream_AttachBuffer2"
+                "BitStream_AttachBuffer"
+                "BitStream_Init"
+            ]
+
         override this.RtlFuncNames : string list =
             [
                 "BitStream_EncodeNonNegativeInteger32Neg"

diff --git a/asn1scc/GenerateRTL.fs b/asn1scc/GenerateRTL.fs
@@ -47,10 +47,9 @@ let findUnusedRtlFunctions (lm:LanguageMacros) (rtlContent:string) (generatedCon
     //first detect all function names
     let directlyUsedFunctions = 
         lm.lg.RtlFuncNames |> List.filter (fun fn -> generatedContent.Contains(fn))
+
 
-    let allUsedFunctions = findAllUsedRtlFunctions lm rtlContent ("BitStream_AttachBuffer"::"BitStream_Init"::directlyUsedFunctions) |> Set.ofList
-    let debug = allUsedFunctions |> Set.toList |> List.sort |> Seq.StrJoin "\n"
-    let debug2 = lm.lg.detectFunctionCalls rtlContent "BitStream_DecodeNonNegativeInteger32Neg" |> Seq.StrJoin "\n"
+    let allUsedFunctions = findAllUsedRtlFunctions lm rtlContent (lm.lg.AlwaysPresentRtlFuncNames@directlyUsedFunctions) |> Set.ofList
     lm.lg.RtlFuncNames |> List.filter (fun fn -> not (allUsedFunctions.Contains(fn)))