Adjust mw map regex to support older versions

[cadmic]

For codewarrior 1.1 (compiler version 2.3.3 build 137) the map format looks like this:

  Starting        Virtual
  address  Size   address
  -----------------------
  00000000 000864 800055a0  1 .text     xlCoreGCN.o
  00000000 000000 800055a0 xlCoreBeforeRender (entry of .text)  xlCoreGCN.o
  0000006c 000000 8000560c lbl_8000560C (entry of .text)        xlCoreGCN.o
  000000b0 000000 80005650 lbl_80005650 (entry of .text)        xlCoreGCN.o
  000000d4 000000 80005674 main (entry of .text)        xlCoreGCN.o

It's missing the "file offset" column compared to codewarrior 2.7:

  Starting        Virtual  File
  address  Size   address  offset
  ---------------------------------
  00000000 005afc 80007020 00003200  1 .text    code_80007020.o
  00000000 000000 80007020 00003200    func_80007020 (entry of .text)   code_80007020.o
  00000090 000000 800070b0 00003290    lbl_800070B0 (entry of .text)    code_80007020.o
  000000a4 000000 800070c4 000032a4    func_800070C4 (entry of .text)   code_80007020.o
  000000ac 000000 800070cc 000032ac    func_800070CC (entry of .text)   code_80007020.o

So I changed the regex to allow for the missing file offset. I also made the alignment field optional so that things like xlCoreBeforeRender above can still be diffed.

I tested this on both the zeldaret/oot-vc (codewarrior 2.7) and zeldaret/oot-gc (codewarrior 1.1) but I'm not sure if there are more versions I should test.

[simonlindholm]

Fine with me, though I'm a little unsure how " \S+ \S+ (\S+) (\S+)? +(?:\S+ )?" + re.escape(fn_name) + ... can match 00000000 000000 800055a0 xlCoreBeforeRender (entry of .text) xlCoreGCN.o -- seems like the regex has two spaces between vaddr and function name while the regex has just one?

Could do (\S*) instead of (\S+)? btw

[cadmic]

Great catch thanks. I think I changed something but didn't retest that (I think the "entry of .text" comes from asm functions, not C).

I also realized that the current regex didn't distinguish between the file offset and alignment, so I tried to make it more specific. It might be too complicated now though so let me know what you think

[simonlindholm]

Looks reasonable! Can always reiterate if the regex doesn't work in some case that pops up.

Another option could be to parse the

  Starting        Virtual  File
  address  Size   address  offset

header to determine the format.