lab3

ddanilyuk · Oct 14, 2020 · 573b7a2 · 573b7a2
1 parent d950ea5
commit 573b7a2
Show file tree

Hide file tree

Showing 8 changed files with 203 additions and 137 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,11 @@
+
+#  **C Complier to ASM written on Swift**
+
+### Compiler:
+
+- Lexing and parsing C code.
+- Generating Cpp file with Inline assembler
+
+### You can:
+
+- Compile functions with local variables.
diff --git a/clangCompiler/AppDelegate.swift b/clangCompiler/AppDelegate.swift
@@ -23,8 +23,10 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
 
         let testCode = """
         int main() {
-            int a;
-            return a;
+            int some() {
+                return 3;
+            }
+            return 5;
         }
         """
 
@@ -37,7 +39,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
             code = try String(contentsOfFile: "3-07-Swift-IV-82-Danyliuk.txt", encoding: String.Encoding.windowsCP1251)
             #endif
 
-            code = testers.lab3test1
+            code = testers.lab3test4
 //            code = testCode
 
             print("File text:\n\(code)\n")
@@ -51,20 +53,21 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
             let node = try parser.parseBlock(blockType: .startPoint)
             print("Tree:\n\(TreePrinter.printTree(root: node))")
 
-//            print("ASM code: ")
-//            let asmCode = try node.interpret(isCPPCode: false)
-//            print(asmCode)
+            /*
+             print("ASM code: ")
+             let asmCode = try node.interpret(isCPPCode: false)
+             print(asmCode)
+             */
 
             #if !DEBUG
-                try asmCode.write(toFile: "Sources/3-07-Swift-IV-82-Danyliuk.asm", atomically: false, encoding: String.Encoding.utf8)
+                try asmCode.write(toFile: "Source/3-07-Swift-IV-82-Danyliuk.asm", atomically: false, encoding: String.Encoding.utf8)
             #endif
 
             print("\nC++ code: ")
             let cppCode = try node.interpret(isCPPCode: true)
             print(cppCode)
 
             #if !DEBUG
-                // "\" may cause error
                 try cppCode.write(toFile: "3-07-Swift-IV-82-Danyliuk.cpp", atomically: false, encoding: String.Encoding.utf8)
             #endif
 

diff --git a/clangCompiler/Main/Block.swift b/clangCompiler/Main/Block.swift
@@ -55,10 +55,11 @@ struct Block: Node {
             }
 
         case .function:
+            let esp = Parser.identifiers.isEmpty ? "" : "\nsub esp, \(Parser.currentVariablePosition)\n"
             result += """
             ; Start function header
             push ebp
-            mov ebp, esp
+            mov ebp, esp \(esp)
             ; End function header\n\n
             """
             for line in nodes {

diff --git a/clangCompiler/Main/Extensions.swift b/clangCompiler/Main/Extensions.swift
@@ -25,7 +25,7 @@ public extension String {
         var result = String()
 
         for subString in subStrings {
-            let arrayOfTabs = Array(repeating: "\t", count: numberOfTabs)
+            let arrayOfTabs = Array(repeating: "    ", count: numberOfTabs)
             let stringOfTabs = arrayOfTabs.reduce("", { "\($0)\($1)"})
             result += "\(stringOfTabs)\(subString)\n"
         }

diff --git a/clangCompiler/Main/Nodes/BinaryOperationNode.swift b/clangCompiler/Main/Nodes/BinaryOperationNode.swift
@@ -1,5 +1,5 @@
 //
-//  InfixOperation.swift
+//  BinaryOperationNode.swift
 //  clangCompiler
 //
 //  Created by Денис Данилюк on 25.09.2020.

diff --git a/clangCompiler/Main/Nodes/FunctionDefinitionNode.swift b/clangCompiler/Main/Nodes/FunctionDefinitionNode.swift
@@ -9,6 +9,7 @@ import Foundation
 
 
 struct FunctionDefinitionNode: Node {
+
     // Funciton name
     let identifier: String
 
@@ -24,6 +25,7 @@ struct FunctionDefinitionNode: Node {
 
 
 extension FunctionDefinitionNode: TreeRepresentable {
+
     var name: String {
         return identifier
     }

diff --git a/clangCompiler/Main/Nodes/VariableNode.swift b/clangCompiler/Main/Nodes/VariableNode.swift
@@ -48,12 +48,12 @@ struct VariableNode: PositionNode {
             if let value = value {
                 result += try value.interpret(isCPPCode: isCPPCode)
                 result.deleteSufix("push eax\n")
-                result += "mov [\(address) + ebp], eax\n"
+                result += "mov [ebp - \(address)], eax\n"
             }
         case .onlyDeclaration:
-            result += "mov [\(address) + ebp], 0\n"
+             result += "mov [ebp - \(address)], 0\n"
         case .getting:
-            result += "mov \(register), [\(address) + ebp]\n"
+            result += "mov \(register), [ebp - \(address)]\n"
         }
 
         return result