quick patch

[Matthew Fluet]

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.
  Send mail to mime@docserver.cac.washington.edu for more info.

--260724133-470231043-962035598=:1869
Content-Type: TEXT/PLAIN; charset=US-ASCII


Here's a quick patch to mlton-2000-06-25 which constrains the Operand.t
Offset variant to have integer offsets (as opposed to Operand.t offsets).
It also shuffles some functors from backend/sources.cm to
backend/c-codegen/sources.cm for modularity.  It's mostly for the
x86-codegen stuff, since that's probably going to have at least 3 or 4
different functors and signatures.

patch -Np1 < mlton-2000-06-26.patch

from the mlton-2000-06-25 directory.


--260724133-470231043-962035598=:1869
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="mlton-2000-06-26.patch"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.LNX.4.10.10006261206380.1869@arsenal.nj.nec.com>
Content-Description: 
Content-Disposition: attachment; filename="mlton-2000-06-26.patch"

ZGlmZiAtTmF1ciBtbHRvbi0yMDAwLTA2LTI1L3NyYy9iYWNrZW5kL2JhY2tlbmQuZnVuIG1sdG9u
LTIwMDAtMDYtMjYvc3JjL2JhY2tlbmQvYmFja2VuZC5mdW4NCi0tLSBtbHRvbi0yMDAwLTA2LTI1
L3NyYy9iYWNrZW5kL2JhY2tlbmQuZnVuCVRodSBKdW4gMjIgMjI6NDQ6NDAgMjAwMA0KKysrIG1s
dG9uLTIwMDAtMDYtMjYvc3JjL2JhY2tlbmQvYmFja2VuZC5mdW4JTW9uIEp1biAyNiAxNTozNzoz
NiAyMDAwDQpAQCAtMzQ5LDggKzM0OSw4IEBADQogCSAgICAgIFByb3BlcnR5LmluaXRGdW4oZm4g
dCA9PiBzb3J0VHlwZXMoMCwgdG9NdHlwZXMoQ3R5cGUuZGV0dXBsZSB0KSkpKQ0KICAgICAgICBp
bg0KIAkgIHZhbCB0dXBsZUluZm8gPSBnZXQNCi0JICBmdW4gdHVwbGVPZmZzZXQodDogQ3R5cGUu
dCwgbjogaW50KTogT3BlcmFuZC50ID0NCi0JICAgICBPcGVyYW5kLmludChMaXN0Lm50aCgjb2Zm
c2V0cyhnZXQgdCksIG4pKQ0KKwkgIGZ1biB0dXBsZU9mZnNldCh0OiBDdHlwZS50LCBuOiBpbnQp
OiBpbnQgPQ0KKwkgICAgIExpc3QubnRoKCNvZmZzZXRzKGdldCB0KSwgbikNCiAgICAgICAgZW5k
DQogDQogICAgICAgIGZ1biBwYXJhbGxlbE1vdmV7c3JjcywgZHN0cywgY2h1bmt9ID0NCkBAIC01
NDMsNyArNTQzLDcgQEANCiAJCWxldCB2YWwge2luZm8gPSB7b2Zmc2V0cywgLi4ufSwgbXR5cGVz
fSA9IGNvbkluZm8gY29uDQogCQlpbiBMaXN0Lm1hcDIob2Zmc2V0cywgbXR5cGVzLCBmbiAoaSwg
dCkgPT4NCiAJCQkgICAgIE9wZXJhbmQub2Zmc2V0e2Jhc2UgPSB2YXJpYW50LA0KLQkJCQkJICAg
IG9mZnNldCA9IE9wZXJhbmQuaW50IGksDQorCQkJCQkgICAgb2Zmc2V0ID0gaSwNCiAJCQkJCSAg
ICB0eSA9IHR9KQ0KIAkJZW5kDQogCSAgaW4gY2FzZSBjb25SZXAgY29uIG9mDQpAQCAtNjEzLDcg
KzYxMyw3IEBADQogCSAgICAgZnVuIGluZGlyZWN0VGFnKCk6IE10cmFuc2Zlci50ID0NCiAJCU10
cmFuc2Zlci5zd2l0Y2gNCiAJCXt0ZXN0ID0gT3BlcmFuZC5vZmZzZXR7YmFzZSA9IHRlc3QsDQot
CQkJCSAgICAgICBvZmZzZXQgPSBPcGVyYW5kLmludCB0YWdPZmZzZXQsDQorCQkJCSAgICAgICBv
ZmZzZXQgPSB0YWdPZmZzZXQsDQogCQkJCSAgICAgICB0eSA9IHRhZ1R5cGV9LA0KIAkJIGRlZmF1
bHQgPSBkZWZhdWx0LA0KIAkJIGNhc2VzID0NCmRpZmYgLU5hdXIgbWx0b24tMjAwMC0wNi0yNS9z
cmMvYmFja2VuZC9jLWNvZGVnZW4vYy1jb2RlZ2VuLmZ1biBtbHRvbi0yMDAwLTA2LTI2L3NyYy9i
YWNrZW5kL2MtY29kZWdlbi9jLWNvZGVnZW4uZnVuDQotLS0gbWx0b24tMjAwMC0wNi0yNS9zcmMv
YmFja2VuZC9jLWNvZGVnZW4vYy1jb2RlZ2VuLmZ1bglUaHUgSnVuIDIyIDAyOjI5OjMzIDIwMDAN
CisrKyBtbHRvbi0yMDAwLTA2LTI2L3NyYy9iYWNrZW5kL2MtY29kZWdlbi9jLWNvZGVnZW4uZnVu
CU1vbiBKdW4gMjYgMTU6Mzc6NTEgMjAwMA0KQEAgLTE1MCw3ICsxNTAsNyBAQA0KICAgICAgICAg
ICAgICAgIGNvbmNhdFsiZ2xvYmFscG9pbnRlck5vblJvb3RbIiwgQy5pbnQgbiwgIl0iXQ0KICAg
ICAgICAgICB8IE9mZnNldHtiYXNlLCBvZmZzZXQsIHR5fSA9Pg0KICAgICAgICAgICAgICAgIGNv
bmNhdFsiTyIsIFR5cGUubmFtZSB0eSwgDQotCQkgICAgICBDLmFyZ3NbdG9TdHJpbmcgYmFzZSwg
dG9TdHJpbmcgb2Zmc2V0XV0NCisJCSAgICAgIEMuYXJnc1t0b1N0cmluZyBiYXNlLCBDLmludCBv
ZmZzZXRdXQ0KICAgICAgICAgICB8IFN0YWNrT2Zmc2V0e29mZnNldCwgdHl9ID0+DQogICAgICAg
ICAgICAgICAgY29uY2F0WyJTIiwgVHlwZS5uYW1lIHR5LCAiKCIsIEMuaW50IG9mZnNldCwgIiki
XQ0KICAgICAgICAgICB8IENvbnRlbnRze29wZXIsIHR5fSA9Pg0KZGlmZiAtTmF1ciBtbHRvbi0y
MDAwLTA2LTI1L3NyYy9iYWNrZW5kL2MtY29kZWdlbi9zb3VyY2VzLmNtIG1sdG9uLTIwMDAtMDYt
MjYvc3JjL2JhY2tlbmQvYy1jb2RlZ2VuL3NvdXJjZXMuY20NCi0tLSBtbHRvbi0yMDAwLTA2LTI1
L3NyYy9iYWNrZW5kL2MtY29kZWdlbi9zb3VyY2VzLmNtCVRodSBKYW4gIDEgMDA6MDA6MDAgMTk3
MA0KKysrIG1sdG9uLTIwMDAtMDYtMjYvc3JjL2JhY2tlbmQvYy1jb2RlZ2VuL3NvdXJjZXMuY20J
TW9uIEp1biAyNiAxNTo0ODowMyAyMDAwDQpAQCAtMCwwICsxLDE0IEBADQorR3JvdXANCisNCitm
dW5jdG9yIENDb2RlR2VuDQorDQoraXMNCisNCisuLi9zb3VyY2VzLmNtDQorLi4vLi4vY29udHJv
bC9zb3VyY2VzLmNtDQorLi4vLi4vbGlicmFyeS9zb3VyY2VzLmNtDQorDQorYy1jb2RlZ2VuLnNp
Zw0KK2MtY29kZWdlbi5mdW4NCisNCisNCmRpZmYgLU5hdXIgbWx0b24tMjAwMC0wNi0yNS9zcmMv
YmFja2VuZC9tYWNoaW5lLW91dHB1dC5mdW4gbWx0b24tMjAwMC0wNi0yNi9zcmMvYmFja2VuZC9t
YWNoaW5lLW91dHB1dC5mdW4NCi0tLSBtbHRvbi0yMDAwLTA2LTI1L3NyYy9iYWNrZW5kL21hY2hp
bmUtb3V0cHV0LmZ1bglXZWQgSnVuIDIxIDIzOjAzOjA2IDIwMDANCisrKyBtbHRvbi0yMDAwLTA2
LTI2L3NyYy9iYWNrZW5kL21hY2hpbmUtb3V0cHV0LmZ1bglNb24gSnVuIDI2IDE1OjM2OjUzIDIw
MDANCkBAIC0zNiw3ICszNiw3IEBADQogCSAgICAgICAgICAgfCBJbnQgb2YgaW50DQogCSAgICAg
ICAgICAgfCBJbnRJbmYgb2YgU21hbGxJbnRJbmYudA0KIAkgICAgICAgICAgIHwgTGFiZWwgb2Yg
TGFiZWwudA0KLQkgICAgICAgICAgIHwgT2Zmc2V0IG9mIHtiYXNlOiB0LCBvZmZzZXQ6IHQsIHR5
OiBUeXBlLnR9DQorCSAgICAgICAgICAgfCBPZmZzZXQgb2Yge2Jhc2U6IHQsIG9mZnNldDogaW50
LCB0eTogVHlwZS50fQ0KIAkgICAgICAgICAgIHwgUG9pbnRlciBvZiBpbnQNCiAgICAgICAgICAg
ICAgICAgICAgfCBSZWdpc3RlciBvZiBSZWdpc3Rlci50DQogICAgICAgICAgICAgICAgICAgIHwg
U3RhY2tPZmZzZXQgb2Yge29mZnNldDogaW50LCB0eTogVHlwZS50fQ0KZGlmZiAtTmF1ciBtbHRv
bi0yMDAwLTA2LTI1L3NyYy9iYWNrZW5kL21hY2hpbmUtb3V0cHV0LnNpZyBtbHRvbi0yMDAwLTA2
LTI2L3NyYy9iYWNrZW5kL21hY2hpbmUtb3V0cHV0LnNpZw0KLS0tIG1sdG9uLTIwMDAtMDYtMjUv
c3JjL2JhY2tlbmQvbWFjaGluZS1vdXRwdXQuc2lnCVdlZCBKdW4gMjEgMjM6MDI6MzYgMjAwMA0K
KysrIG1sdG9uLTIwMDAtMDYtMjYvc3JjL2JhY2tlbmQvbWFjaGluZS1vdXRwdXQuc2lnCU1vbiBK
dW4gMjYgMTU6MzY6NDIgMjAwMA0KQEAgLTQ2LDcgKzQ2LDcgQEANCiAJICAgICAgICAgICB8IElu
dCBvZiBpbnQNCiAJICAgICAgICAgICB8IEludEluZiBvZiBTbWFsbEludEluZi50DQogCSAgICAg
ICAgICAgfCBMYWJlbCBvZiBMYWJlbC50DQotCSAgICAgICAgICAgfCBPZmZzZXQgb2Yge2Jhc2U6
IHQsIG9mZnNldDogdCwgdHk6IFR5cGUudH0NCisJICAgICAgICAgICB8IE9mZnNldCBvZiB7YmFz
ZTogdCwgb2Zmc2V0OiBpbnQsIHR5OiBUeXBlLnR9DQogCSAgICAgICAgICAgfCBQb2ludGVyIG9m
IGludA0KICAgICAgICAgICAgICAgICAgICB8IFJlZ2lzdGVyIG9mIFJlZ2lzdGVyLnQNCiAgICAg
ICAgICAgICAgICAgICAgfCBTdGFja09mZnNldCBvZiB7b2Zmc2V0OiBpbnQsIHR5OiBUeXBlLnR9
DQpkaWZmIC1OYXVyIG1sdG9uLTIwMDAtMDYtMjUvc3JjL2JhY2tlbmQvbWFjaGluZS5mdW4gbWx0
b24tMjAwMC0wNi0yNi9zcmMvYmFja2VuZC9tYWNoaW5lLmZ1bg0KLS0tIG1sdG9uLTIwMDAtMDYt
MjUvc3JjL2JhY2tlbmQvbWFjaGluZS5mdW4JV2VkIEp1biAyMSAyMzowMzoyNiAyMDAwDQorKysg
bWx0b24tMjAwMC0wNi0yNi9zcmMvYmFja2VuZC9tYWNoaW5lLmZ1bglNb24gSnVuIDI2IDE1OjQ0
OjQyIDIwMDANCkBAIC0xMDAsNyArMTAwLDcgQEANCiAgICAgICBjb25jYXRbImdsb2JhbHBvaW50
ZXJOb25Sb290WyIsIEludC50b1N0cmluZyBuLCAiXSJdDQogICAgICAgfCB0b1N0cmluZyAoT2Zm
c2V0e2Jhc2UsIG9mZnNldCwgdHl9KSANCiAgICAgICA9IGNvbmNhdFsiTyIsIFR5cGUubmFtZSB0
eSwgDQotCSAgICAgICAiKCIsIHRvU3RyaW5nIGJhc2UsICIsIiwgdG9TdHJpbmcgb2Zmc2V0LCAi
KSJdDQorCSAgICAgICAiKCIsIHRvU3RyaW5nIGJhc2UsICIsIiwgSW50LnRvU3RyaW5nIG9mZnNl
dCwgIikiXQ0KICAgICAgIHwgdG9TdHJpbmcgKFN0YWNrT2Zmc2V0e29mZnNldCwgdHl9KSA9DQog
ICAgICAgY29uY2F0WyJTIiwgVHlwZS5uYW1lIHR5LCAiKCIsIEludC50b1N0cmluZyBvZmZzZXQs
ICIpIl0NCiAgICAgICB8IHRvU3RyaW5nIChDb250ZW50c3tvcGVyLCB0eX0pIA0KQEAgLTE2Miw3
ICsxNjIsNyBAQA0KICAgICAgIHwgZXF1YWxzIChJbnRJbmYgbiwgSW50SW5mIG4nKSA9IFNtYWxs
SW50SW5mLmVxdWFscyhuLCBuJykNCiAgICAgICB8IGVxdWFscyAoT2Zmc2V0e2Jhc2UgPSBiLCBv
ZmZzZXQgPSBpLCAuLi59LA0KIAkJT2Zmc2V0e2Jhc2UgPSBiJywgb2Zmc2V0ID0gaScsIC4uLn0p
IA0KLSAgICAgID0gZXF1YWxzKGIsIGInKSBhbmRhbHNvIGVxdWFscyhpLCBpJykgDQorICAgICAg
PSBlcXVhbHMoYiwgYicpIGFuZGFsc28gaSA9IGknIA0KICAgICAgIHwgZXF1YWxzIChQb2ludGVy
IG4sIFBvaW50ZXIgbicpID0gbiA9IG4nDQogICAgICAgfCBlcXVhbHMgKFJlZ2lzdGVyIHIsIFJl
Z2lzdGVyIHInKSA9IFJlZ2lzdGVyLmVxdWFscyhyLCByJykNCiAgICAgICB8IGVxdWFscyAoU3Rh
Y2tPZmZzZXR7b2Zmc2V0ID0gbiwgLi4ufSwgDQpAQCAtMTc4LDcgKzE3OCw3IEBADQogCSAgICB8
IChDb250ZW50c3tvcGVyLCAuLi59LCBfKSA9PiBpbnRlciBvcGVyDQogCSAgICB8IChHbG9iYWwg
ZywgR2xvYmFsIGcnKSA9PiBHbG9iYWwuZXF1YWxzKGcsIGcnKQ0KIAkgICAgfCAoR2xvYmFsUG9p
bnRlck5vblJvb3QgaSwgR2xvYmFsUG9pbnRlck5vblJvb3QgaikgPT4gaSA9IGoNCi0JICAgIHwg
KE9mZnNldHtiYXNlLCBvZmZzZXQsIC4uLn0sIF8pID0+IGludGVyIGJhc2Ugb3JlbHNlIGludGVy
IG9mZnNldA0KKwkgICAgfCAoT2Zmc2V0e2Jhc2UsIG9mZnNldCwgLi4ufSwgXykgPT4gaW50ZXIg
YmFzZQ0KIAkgICAgfCAoUmVnaXN0ZXIgciwgUmVnaXN0ZXIgcicpID0+IFJlZ2lzdGVyLmVxdWFs
cyhyLCByJykNCiAJICAgIHwgKFN0YWNrT2Zmc2V0e29mZnNldCA9IG9mZiwgdHkgPSB0eX0sDQog
CSAgICAgICBTdGFja09mZnNldHtvZmZzZXQgPSBvZmYnLCB0eSA9IHR5J30pID0+DQpkaWZmIC1O
YXVyIG1sdG9uLTIwMDAtMDYtMjUvc3JjL2JhY2tlbmQvbWFjaGluZS5zaWcgbWx0b24tMjAwMC0w
Ni0yNi9zcmMvYmFja2VuZC9tYWNoaW5lLnNpZw0KLS0tIG1sdG9uLTIwMDAtMDYtMjUvc3JjL2Jh
Y2tlbmQvbWFjaGluZS5zaWcJV2VkIEp1biAyMSAyMzowMTozMyAyMDAwDQorKysgbWx0b24tMjAw
MC0wNi0yNi9zcmMvYmFja2VuZC9tYWNoaW5lLnNpZwlNb24gSnVuIDI2IDE1OjQ1OjM1IDIwMDAN
CkBAIC01Miw3ICs1Miw3IEBADQogCSAgICB2YWwgaW50SW5mOiBTbWFsbEludEluZi50IC0+IHQN
CiAJICAgIHZhbCBpbnRlcmZlcmU6IHt3cml0ZTogdCwgcmVhZDogdH0gLT4gYm9vbA0KIAkgICAg
dmFsIGxhYmVsOiBMYWJlbC50IC0+IHQNCi0JICAgIHZhbCBvZmZzZXQ6IHtiYXNlOiB0LCBvZmZz
ZXQ6IHQsIHR5OiBUeXBlLnR9IC0+IHQNCisJICAgIHZhbCBvZmZzZXQ6IHtiYXNlOiB0LCBvZmZz
ZXQ6IGludCwgdHk6IFR5cGUudH0gLT4gdA0KIAkgICAgdmFsIHBvaW50ZXI6IGludCAtPiB0ICgq
IEluIChwb2ludGVyIG4pLCBuIG11c3QgYmUgbm9uemVybyBtb2QgNC4gKikNCiAJICAgIHZhbCBy
ZWdpc3RlcjogUmVnaXN0ZXIudCAtPiB0DQogCSAgICB2YWwgc3RhY2tPZmZzZXQ6IHtvZmZzZXQ6
IGludCwgdHk6IFR5cGUudH0gLT4gdA0KZGlmZiAtTmF1ciBtbHRvbi0yMDAwLTA2LTI1L3NyYy9i
YWNrZW5kL3NvdXJjZXMuY20gbWx0b24tMjAwMC0wNi0yNi9zcmMvYmFja2VuZC9zb3VyY2VzLmNt
DQotLS0gbWx0b24tMjAwMC0wNi0yNS9zcmMvYmFja2VuZC9zb3VyY2VzLmNtCVRodSBKdW4gMjIg
MjE6MTg6MTMgMjAwMA0KKysrIG1sdG9uLTIwMDAtMDYtMjYvc3JjL2JhY2tlbmQvc291cmNlcy5j
bQlNb24gSnVuIDI2IDE1OjQ3OjA4IDIwMDANCkBAIC0xLDkgKzEsMTIgQEANCiBHcm91cA0KIA0K
LWZ1bmN0b3IgQ0NvZGVHZW4NCitzaWduYXR1cmUgTUFDSElORV9PVVRQVVQNCitzaWduYXR1cmUg
TVRZUEUNCisNCiBmdW5jdG9yIEJhY2tlbmQNCiBmdW5jdG9yIE1hY2hpbmUNCiBmdW5jdG9yIE1h
Y2hpbmVPdXRwdXQgDQorZnVuY3RvciBNdHlwZQ0KICAgDQogaXMNCiANCkBAIC0zNCw4ICszNyw1
IEBADQogcGFyYWxsZWwtbW92ZS5mdW4NCiByZXByZXNlbnRhdGlvbi5zaWcNCiByZXByZXNlbnRh
dGlvbi5mdW4NCi0NCi1jLWNvZGVnZW4vYy1jb2RlZ2VuLnNpZw0KLWMtY29kZWdlbi9jLWNvZGVn
ZW4uZnVuDQogDQogDQpkaWZmIC1OYXVyIG1sdG9uLTIwMDAtMDYtMjUvc3JjL21haW4vc291cmNl
cy5jbSBtbHRvbi0yMDAwLTA2LTI2L3NyYy9tYWluL3NvdXJjZXMuY20NCi0tLSBtbHRvbi0yMDAw
LTA2LTI1L3NyYy9tYWluL3NvdXJjZXMuY20JVHVlIEp1biAyMCAyMjoyMDo1MiAyMDAwDQorKysg
bWx0b24tMjAwMC0wNi0yNi9zcmMvbWFpbi9zb3VyY2VzLmNtCU1vbiBKdW4gMjYgMTU6NDY6NDcg
MjAwMA0KQEAgLTIzLDYgKzIzLDcgQEANCiAuLi9hc3Qvc291cmNlcy5jbQ0KIC4uL2F0b21zL3Nv
dXJjZXMuY20NCiAuLi9iYWNrZW5kL3NvdXJjZXMuY20NCisuLi9iYWNrZW5kL2MtY29kZWdlbi9z
b3VyY2VzLmNtDQogLi4vY2xvc3VyZS1jb252ZXJ0L3NvdXJjZXMuY20NCiAuLi9jb250cm9sL3Nv
dXJjZXMuY20NCiAuLi9jb3JlLW1sL3NvdXJjZXMuY20NCg==

--260724133-470231043-962035598=:1869--