diff --git a/ass3/zbirnik/parsing/exp2.obj b/ass3/zbirnik/parsing/exp2.obj index 228479f..66b4048 100644 --- a/ass3/zbirnik/parsing/exp2.obj +++ b/ass3/zbirnik/parsing/exp2.obj @@ -1,6 +1,6 @@ -Harith 00000000004F +Harith 00000000004f T0000001c0310003a1b20360f203603202d1f202d0f20300320242320240f202a T00001c1e03201b27201b0f202403201523201e0f201e0320091f20180f20153f2ffd T00003a0600000b000005 -M00000105 +M00000105 E000000 diff --git a/ass3/zbirnik/parsing/out.obj b/ass3/zbirnik/parsing/out.obj index e69de29..93fb5fb 100644 --- a/ass3/zbirnik/parsing/out.obj +++ b/ass3/zbirnik/parsing/out.obj @@ -0,0 +1,6 @@ +HARITH 00000000004F +T0000001C0310003A1B20360F203603202D1F202D0F20300320242320240F202A +T00001C1E03201B27201B0F202403201523201E0F201E0320091F20180F20153F2FFD +T00003A0600000B000005 +M00000105 +E000000 diff --git a/ass3/zbirnik/parsing/pregledovalnik.go b/ass3/zbirnik/parsing/pregledovalnik.go index a29ed34..90b50e4 100644 --- a/ass3/zbirnik/parsing/pregledovalnik.go +++ b/ass3/zbirnik/parsing/pregledovalnik.go @@ -807,7 +807,7 @@ func generacija(AST *[]ukaz) { return } defer obj.Close() - fmt.Println("H", ime_programa, naslov_programa, lc_global + (*AST)[len(*AST) - 1].Velikost() - naslov_programa) + obj.WriteString(fmt.Sprintf("H%-*s%06x%06x\n", 6, ime_programa, naslov_programa, lc_global + (*AST)[len(*AST) - 1].Velikost() - naslov_programa)) line_len := 0 line := "" line_addr := naslov_programa @@ -883,17 +883,17 @@ func generacija(AST *[]ukaz) { line_len += el.Velikost() line = fmt.Sprintf("%s%s", line, temp) } else { - fmt.Printf("T: %x, %x, %s\n", line_addr, line_len, line) + obj.WriteString(fmt.Sprintf("T%06x%02x%s\n", line_addr, line_len, line)) line_len = el.Velikost() line = temp line_addr = el.GetAddr() } } - fmt.Printf("T: %x, %x, %s\n", line_addr, line_len, line) + obj.WriteString(fmt.Sprintf("T%06x%02x%s\n", line_addr, line_len, line)) for _, el := range M_tabela { - fmt.Printf("M: %06x, %02x \n", el.odmik, el.dolzina) + obj.WriteString(fmt.Sprintf("M%06x%02x\n", el.odmik, el.dolzina)) } - fmt.Printf("END %06x", zacetni_naslov) + obj.WriteString(fmt.Sprintf("E%06x", zacetni_naslov)) } func izpis(AST *[]ukaz) { diff --git a/ass3/zbirnik/parsing/test.go b/ass3/zbirnik/parsing/test.go index 04eab57..fff8fb7 100644 --- a/ass3/zbirnik/parsing/test.go +++ b/ass3/zbirnik/parsing/test.go @@ -5,8 +5,6 @@ import ( ) func main() { - line := "" - line = fmt.Sprintf("%s%02x", line, 15) - line = fmt.Sprintf("%s%02x", line, 14) - fmt.Println(line) + x := "srq" + fmt.Printf("|%-*s|", 4, x) }