Merge pull request #3 from oco2000/new-dwarf-so

New libdwarf library updates

Author: oco2000

INSTALL.md

@@ -31,21 +31,10 @@ sudo modprobe usb-storage
 Get **qEMU** for ARM to debug your programs without a real device. Install **qemu-system-arm** package using your package manager.
 
 ## libelf
-Get **libelf** library for elf-files production. Install **libelf1** package
+Get **libelf1** library for elf-files production. In most cases you should just install **libelf1** package
 
 ## libdwarf
-Get **libdwarf** library for debug symbols generation.
-You can just copy **libdwarf.so** from this repo to **/usr/lib**. If you see any errors, you should make it by yourself.
-Install **dwarfutils** from source:
-```bash
-apt-get source dwarfutils
-```
-In the **libdwarf** folder run:
-```bash
-./configure --enable-shared
-make
-```
-You'll get libdwarf.so
+Get **libdwarf1** library for debug symbols generation. In most cases you should just install **libdwarf1** package
 
 ## ddd
 Get **ddd** (data display debugger). Install **ddd** package.

examples/tester/makefile

@@ -11,8 +11,8 @@ st_path = ~/src/stlink
 $(project).spf.elf: *.spf
 	$(compiler) options.spf -H -I -O -d -M  S\" $(device)\" S\" $(project).spf\" m3forth.spf
 	arm-none-eabi-objdump -S -w $(project).spf.elf > $(project).spf.lst
-#	readelf -Ww $(project).spf.elf > $(project).spf.debug
-#	readelf -aW $(project).spf.elf > $(project).spf.info
+	readelf -Ww $(project).spf.elf > $(project).spf.debug
+	readelf -aW $(project).spf.elf > $(project).spf.info
 	chmod o+x $(project).spf.elf
 
 # debug project with qemu, uart emulation or semihosting and ddd

lib/dwarf/dwarf.spf

@@ -170,7 +170,7 @@ CREATE temp_symbol /symbol ALLOT
 
 : add_file_symbol ( a u -- ) \ add file name
     0 0 2SWAP
-    STB_LOCAL STT_FILE ELF32_ST_INFO
+    STB_GLOBAL STT_FILE ELF32_ST_INFO
     SHN_ABS
     add_symbol
 ;
@@ -275,7 +275,7 @@ CREATE temp_symbol /symbol ALLOT
 : DWARF_ERROR ( f a u -- ) \ if true show string and error message using dwarf_errmsg
     ROT IF
         ." ERROR! " TYPE SPACE
-        (( error @ )) dwarf_errmsg ASCIIZ> TYPE SPACE BYE
+        (( error @ )) dwarf_errmsg ASCIIZ> TYPE CR BYE
     ELSE 2DROP THEN
 ;
 
@@ -450,6 +450,22 @@ CREATE LAST_SUB /sd ALLOT \ last subprogram data
 
 CREATE init_bytes \ taken from c-code compiled elf
   0x0C C, 0x0D C, 0 C, \ equals DW_CFA_def_cfa: r13 ofs 0
+  0x07 C, 0x00 C, 0 C, \ equals DW_CFA_undefined: r0 undefined
+  0x07 C, 0x01 C, 0 C, \ equals DW_CFA_undefined: r1 undefined
+  0x07 C, 0x02 C, 0 C, \ equals DW_CFA_undefined: r2 undefined
+  0x07 C, 0x03 C, 0 C, \ equals DW_CFA_undefined: r3 undefined
+  0x07 C, 0x04 C, 0 C, \ equals DW_CFA_undefined: r4 undefined
+  0x07 C, 0x05 C, 0 C, \ equals DW_CFA_undefined: r5 undefined
+  0x07 C, 0x06 C, 0 C, \ equals DW_CFA_undefined: r6 undefined
+  0x07 C, 0x07 C, 0 C, \ equals DW_CFA_undefined: r7 undefined
+  0x07 C, 0x08 C, 0 C, \ equals DW_CFA_undefined: r8 undefined
+  0x07 C, 0x09 C, 0 C, \ equals DW_CFA_undefined: r9 undefined
+  0x07 C, 0x0A C, 0 C, \ equals DW_CFA_undefined: r10 undefined
+  0x07 C, 0x0B C, 0 C, \ equals DW_CFA_undefined: r11 undefined
+  0x07 C, 0x0C C, 0 C, \ equals DW_CFA_undefined: r12 undefined
+  0x0C C, 0x0D C, 0 C, \ equals DW_CFA_def_cfa: r13 ofs 0
+  \ r14 is specified in dwarf_add_frame_cie
+  \ r15 is pc, no need to specify init state
 HERE init_bytes - CONSTANT init_bytes_len
 
 : dwarf_add_frame_cie ( -- )
@@ -505,6 +521,7 @@ EXPORT
 \ ========================= create new file with debugging info ============================
 
 O_ELF [IF]
+VARIABLE _dw
 
 : DWARF_INIT ( load_addr addr a u -- ) \ create new file
 \ load_addr - load address
@@ -521,14 +538,20 @@ O_ELF [IF]
     create_section_text \ create .text section
 
     \ init dwarf producer
-    (( DW_DLC_WRITE DW_DLC_SYMBOLIC_RELOCATIONS OR 0
+    ((
+        DW_DLC_WRITE DW_DLC_SYMBOLIC_RELOCATIONS OR 0 \ DWORD
         ['] dwarf_callback_func_c \ function to create elf sections
-        0
-        0
-        0
-        0
-    )) dwarf_producer_init_c DUP TO dw
-    -1 = S" Dwarf producer init failed!" DWARF_ERROR
+        0 \ errhand
+        0 \ errarg
+        0 \ user_data
+        S" arm" >ASCIIZ \ *isa_name
+        S" V2" >ASCIIZ \ *dwarf_version
+        0 \ *extra
+        _dw \ dw
+        error \ error
+    )) dwarf_producer_init
+    DW_DLV_ERROR = S" Dwarf producer init failed!" DWARF_ERROR
+    _dw @ TO dw
 
     dwarf_new_CU    \ create main CU
 

lib/dwarf/libdwarf.spf

@@ -2,7 +2,7 @@ REQUIRE 2CONSTANT lib/include/double.f
 
 BASE @ DECIMAL
 
-USE libdwarf.so
+USE libdwarf.so.1
 \ in ubuntu you need to build it from source:
 \   apt-get source libdwarf-dev
 \   ./configure --enable-shared --disable-nonshared