That looks correct.
Be aware that support for handling long long operands (64 bits) - or doubles is not well supported on AVR. So you may expose some problems with this.
We currently have long long disabled in testsuite testing to avoid noise. At some point I hope to switch it back on to see where we are - but I have enough to deal with <64 bits a present.
Andy