Merging the lib3d.lib into gfx

[zx70]

Merging the lib3d.lib into gfx

[suborb]

@zx70 I've created a branch with the folding of lib3d into the cpu libraries.

If you want to sanity check that would be great.

[suborb]

You probably need to rebuild z80asm or grab it from nightly.

It should be:

z88dk-z80asm -mf
error: invalid cpu: f; expected: 8080,8085,ez80,ez80_z80,gbz80,kc160,kc160_z80,r2ka,r3k,r4k,r5k,r800,z180,z80,z80_strict,z80n,ti83,ti83plus

[zx70]

Thankyou @feilipu, my local setup is slowly building the libraries 😹
It is very nice to try spotting those problems I'm aware of and discover they're solved already !
Those capital initials were something I kept untouched from the original Hitech C based SDK for the Sharp Wizard organizers for cross-compatibility.

[zx70]

I'd keep everything lowercase only, I noticed that this library was never used very much, we also have some redundancy with code coming from the MSX world and others which I tried to merge with partial success.
A local #define is not difficult to add, if it will be ever necessary.

I just noticed that OZDK is sort of surviving, which is definitely a good thing, for the Wizard it is still preferrable to z88dk (but for our larger library), it supports a well tested target specific memory model allowing bigger programs.

https://github.com/arpruss/ozdev

https://github.com/arpruss/ozdev/blob/master/liboz/32k.as
https://github.com/arpruss/ozdev/blob/master/liboz/32k-noozpack.as

[suborb]

It should be fairly easy to do. The main thing to watch out for is the .asm files and 8080/gbz80 variants.

[zx70]

If lib3d.lib becomes transparent also the Makefiles for the examples will need a fix.

[feilipu]

Just a thought (since this is a tidy up), there's inconsistent use of capitalisation for the Type definitions. Sometimes they are capitalised Vector_t, and sometimes lower case vector_t (just for example). Probably lower case should be used throughout, but either way is ok if they are all the same. But not some in lowercase and some in uppercase, which is just confusing.

[zx70]

I'm currently stumbling on this one

error: invalid cpu: r4k; expected: z80,z80n,z180,r2ka,r3k,8080,8085,gbz80,ti83,ti83plus
make[2]: *** [adt/heap/heap.mak:28: adt/heap/obj/r4k/adt_HeapAdd.o] Error 1

[zx70]

Thank you. While testing I'm pulling the correction @feilipu suggested in the pending branch.

[feilipu]

Fixed the build issue in example showlib3d.c (hopefully). And a few more.

[feilipu]

I was thinking to convert all z88dk references to the lowercase, and then (when clean) add in a define for the capitalised type versions so that we don't break user programs.

Ok?

[feilipu]

It seems all good now.

Ready for PR, unless there's more to add elsewhere.

[zx70]

The ZX81 and Lambda targets are now working well :)

There is still something not looking right with the non-z80 CPUs (perhaps my setup is wrong), but I think it we have a good progress already, enough for a pull.

The extra problems I've found:

$ zcc +cpm -clib=8080 -create-app -lm -lgfxvti coswave.c
error: file not found: genmath_8080.lib



$ zcc +cpm -clib=8080 -create-app -lgfxvti showlib3d.c
video/vti/stdio/generic_console.asm:41: error: undefined symbol: __z80asm__ldir
  ^---- __z80asm__ldir
video/vti/stdio/generic_console.asm:109: error: undefined symbol: __z80asm__ldir
  ^---- __z80asm__ldir
lib3d/icos.asm:24: error: undefined symbol: __z80asm__sbc_hl_bc
  ^---- __z80asm__sbc_hl_bc
lib3d/isin.asm:23: error: undefined symbol: __z80asm__sbc_hl_de
  ^---- __z80asm__sbc_hl_de
lib3d/isin.asm:26: error: undefined symbol: __z80asm__sbc_hl_bc
  ^---- __z80asm__sbc_hl_bc
lib3d/isin.asm:41: error: undefined symbol: __z80asm__sbc_hl_de
  ^---- __z80asm__sbc_hl_de
lib3d/isin.asm:44: error: undefined symbol: __z80asm__sbc_hl_bc
  ^---- __z80asm__sbc_hl_bc
lib3d/isin.asm:63: error: undefined symbol: __z80asm__sbc_hl_de
  ^---- __z80asm__sbc_hl_de

[feilipu]

$ zcc +cpm -clib=8080 -create-app -lm -lgfxvti coswave.c
error: file not found: genmath_8080.lib

It could be made more intuitive, but genmath isn't 8080/85 supported. Try the Microsoft or DAI math libraries.

See the Math Library Wiki.

[suborb]

And the other errors are due to missing the z80asm libraries in lib/

[zx70]

Thank you sirs :)